Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support repr on Time #32103

Merged
merged 2 commits into from
May 22, 2019
+46 −10
Merged

Support repr on Time #32103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4601dc7
Support repr on Time
omus May 21, 2019
3a3c12c
Print directly to IOContext
omus May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion stdlib/Dates/src/io.jl
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,31 @@ function Base.string(t::Time)
return "$hh:$mii:$ss$ns"
end

Base.show(io::IO, x::Time) = print(io, string(x))
Base.show(io::IO, ::MIME"text/plain", t::Time) = print(io, t)
Base.print(io::IO, t::Time) = print(io, string(t))

function Base.show(io::IO, t::Time)
if get(io, :compact, false)
print(io, t)
else
values = [
hour(t)
minute(t)
second(t)
millisecond(t)
microsecond(t)
nanosecond(t)
]
index = something(findlast(!iszero, values), 1)

print(io, Time, "(")
for i in 1:index
show(io, values[i])
i != index && print(io, ", ")
end
print(io, ")")
end
end

@inline function format(io, d::AbstractDateToken, dt, locale)
format(io, d, dt)
30 changes: 21 additions & 9 deletions stdlib/Dates/test/io.jl
View file
Original file line number Diff line number Diff line change
@@ -73,16 +73,28 @@ end
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 500)) == "2000-01-01T00:00:00.5"
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 998)) == "2000-01-01T00:00:00.998"
@test string(Dates.DateTime(2000, 1, 1, 0, 0, 0, 999)) == "2000-01-01T00:00:00.999"
@test string(Dates.Time(0)) == "00:00:00"
@test string(Dates.Time(0, 1)) == "00:01:00"
@test string(Dates.Time(0, 1, 2)) == "00:01:02"
@test string(Dates.Time(0, 1, 2, 3)) == "00:01:02.003"
@test string(Dates.Time(0, 1, 2, 3, 4)) == "00:01:02.003004"
@test string(Dates.Time(0, 1, 2, 3, 4, 5)) == "00:01:02.003004005"
@test string(Dates.Time(0, 0, 0, 0, 1)) == "00:00:00.000001"
@test string(Dates.Time(0, 0, 0, 0, 0, 1)) == "00:00:00.000000001"
@test string(Dates.Time(0, 0, 0, 1)) == "00:00:00.001"
end

@testset "string/show representation of Time" begin
tests = [
Dates.Time(0) => ("00:00:00", "Dates.Time(0)"),
Dates.Time(0, 1) => ("00:01:00", "Dates.Time(0, 1)"),
Dates.Time(0, 1, 2) => ("00:01:02", "Dates.Time(0, 1, 2)"),
Dates.Time(0, 1, 2, 3) => ("00:01:02.003", "Dates.Time(0, 1, 2, 3)"),
Dates.Time(0, 1, 2, 3, 4) => ("00:01:02.003004", "Dates.Time(0, 1, 2, 3, 4)"),
Dates.Time(0, 1, 2, 3, 4, 5) => ("00:01:02.003004005", "Dates.Time(0, 1, 2, 3, 4, 5)"),
Dates.Time(0, 0, 0, 0, 0, 1) => ("00:00:00.000000001", "Dates.Time(0, 0, 0, 0, 0, 1)"),
Dates.Time(0, 0, 0, 1) => ("00:00:00.001", "Dates.Time(0, 0, 0, 1)"),
]

for (t, (printed, shown)) in tests
@test sprint(print, t) == printed
@test string(t) == printed
@test sprint(show, t) == shown
@test repr(t) == shown
end
end

@testset "DateTime parsing" begin
# Useful reference for different locales: http://library.princeton.edu/departments/tsd/katmandu/reference/months.html