Skip to content

Commit f890d86

Browse files
authored
Merge pull request #35582 from stev47/feature/dates-pad-milli
zero-pad milliseconds for DateTime
2 parents 6e7bc68 + f13843d commit f890d86

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

stdlib/Dates/src/io.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,9 +580,9 @@ end
580580
# show
581581
function Base.print(io::IO, dt::DateTime)
582582
str = if millisecond(dt) == 0
583-
format(dt, dateformat"YYYY-mm-dd\THH:MM:SS", 24)
583+
format(dt, dateformat"YYYY-mm-dd\THH:MM:SS", 19)
584584
else
585-
format(dt, dateformat"YYYY-mm-dd\THH:MM:SS.s", 26)
585+
format(dt, dateformat"YYYY-mm-dd\THH:MM:SS.sss", 23)
586586
end
587587
print(io, str)
588588
end

stdlib/Dates/test/conversions.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ using Dates
1111
@test Dates.value(Dates.DateTime(1970)) == Dates.UNIXEPOCH
1212

1313
# Tests from here: https://en.wikipedia.org/wiki/Unix_time
14-
@test string(Dates.unix2datetime(1095379198.75)) == string("2004-09-16T23:59:58.75")
14+
@test string(Dates.unix2datetime(1095379198.75)) == string("2004-09-16T23:59:58.750")
1515
@test string(Dates.unix2datetime(1095379199.00)) == string("2004-09-16T23:59:59")
16-
@test string(Dates.unix2datetime(1095379199.25)) == string("2004-09-16T23:59:59.25")
17-
@test string(Dates.unix2datetime(1095379199.50)) == string("2004-09-16T23:59:59.5")
18-
@test string(Dates.unix2datetime(1095379199.75)) == string("2004-09-16T23:59:59.75")
16+
@test string(Dates.unix2datetime(1095379199.25)) == string("2004-09-16T23:59:59.250")
17+
@test string(Dates.unix2datetime(1095379199.50)) == string("2004-09-16T23:59:59.500")
18+
@test string(Dates.unix2datetime(1095379199.75)) == string("2004-09-16T23:59:59.750")
1919
@test string(Dates.unix2datetime(1095379200.00)) == string("2004-09-17T00:00:00")
20-
@test string(Dates.unix2datetime(1095379200.25)) == string("2004-09-17T00:00:00.25")
21-
@test string(Dates.unix2datetime(1095379200.50)) == string("2004-09-17T00:00:00.5")
22-
@test string(Dates.unix2datetime(1095379200.75)) == string("2004-09-17T00:00:00.75")
20+
@test string(Dates.unix2datetime(1095379200.25)) == string("2004-09-17T00:00:00.250")
21+
@test string(Dates.unix2datetime(1095379200.50)) == string("2004-09-17T00:00:00.500")
22+
@test string(Dates.unix2datetime(1095379200.75)) == string("2004-09-17T00:00:00.750")
2323
@test string(Dates.unix2datetime(1095379201.00)) == string("2004-09-17T00:00:01")
24-
@test string(Dates.unix2datetime(1095379201.25)) == string("2004-09-17T00:00:01.25")
25-
@test string(Dates.unix2datetime(915148798.75)) == string("1998-12-31T23:59:58.75")
24+
@test string(Dates.unix2datetime(1095379201.25)) == string("2004-09-17T00:00:01.250")
25+
@test string(Dates.unix2datetime(915148798.75)) == string("1998-12-31T23:59:58.750")
2626
@test string(Dates.unix2datetime(915148799.00)) == string("1998-12-31T23:59:59")
27-
@test string(Dates.unix2datetime(915148799.25)) == string("1998-12-31T23:59:59.25")
28-
@test string(Dates.unix2datetime(915148799.50)) == string("1998-12-31T23:59:59.5")
29-
@test string(Dates.unix2datetime(915148799.75)) == string("1998-12-31T23:59:59.75")
27+
@test string(Dates.unix2datetime(915148799.25)) == string("1998-12-31T23:59:59.250")
28+
@test string(Dates.unix2datetime(915148799.50)) == string("1998-12-31T23:59:59.500")
29+
@test string(Dates.unix2datetime(915148799.75)) == string("1998-12-31T23:59:59.750")
3030
@test string(Dates.unix2datetime(915148800.00)) == string("1999-01-01T00:00:00")
31-
@test string(Dates.unix2datetime(915148800.25)) == string("1999-01-01T00:00:00.25")
32-
@test string(Dates.unix2datetime(915148800.50)) == string("1999-01-01T00:00:00.5")
33-
@test string(Dates.unix2datetime(915148800.75)) == string("1999-01-01T00:00:00.75")
31+
@test string(Dates.unix2datetime(915148800.25)) == string("1999-01-01T00:00:00.250")
32+
@test string(Dates.unix2datetime(915148800.50)) == string("1999-01-01T00:00:00.500")
33+
@test string(Dates.unix2datetime(915148800.75)) == string("1999-01-01T00:00:00.750")
3434
@test string(Dates.unix2datetime(915148801.00)) == string("1999-01-01T00:00:01")
35-
@test string(Dates.unix2datetime(915148801.25)) == string("1999-01-01T00:00:01.25")
35+
@test string(Dates.unix2datetime(915148801.25)) == string("1999-01-01T00:00:01.250")
3636
end
3737

3838
@testset "conversion to/from Rata Die" begin

stdlib/Dates/test/io.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using Dates
1818
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 1)) == "2000-01-01T00:00:00.001"
1919
@test sprint(show, Dates.DateTime(2000, 1, 1, 0, 0, 0, 1)) == "Dates.DateTime(\"2000-01-01T00:00:00.001\")"
2020
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 2)) == "2000-01-01T00:00:00.002"
21-
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 500)) == "2000-01-01T00:00:00.5"
21+
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 500)) == "2000-01-01T00:00:00.500"
2222
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 998)) == "2000-01-01T00:00:00.998"
2323
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 999)) == "2000-01-01T00:00:00.999"
2424
end

0 commit comments

Comments
 (0)