Eliminate problematic Dates conversions and one definition

Fixes #19896

base/dates/periods.jl

@@ -35,29 +35,25 @@ for period in (:Year, :Month, :Week, :Day, :Hour, :Minute, :Second, :Millisecond
         """ $period(v)
     end
 end
-# Now we're safe to define Period-Number conversions
-# Anything an Int64 can convert to, a Period can convert to
-Base.convert{T<:Number}(::Type{T},x::Period) = convert(T,value(x))
-Base.convert{T<:Period}(::Type{T},x::Real) = T(x)
 
 #Print/show/traits
 Base.string{P<:Period}(x::P) = string(value(x),_units(x))
 Base.show(io::IO,x::Period) = print(io,string(x))
 Base.zero{P<:Period}(::Union{Type{P},P}) = P(0)
-Base.one{P<:Period}(::Union{Type{P},P}) = P(1)
+Base.one{P<:Period}(::Union{Type{P},P}) = 1  # see #16116
 Base.typemin{P<:Period}(::Type{P}) = P(typemin(Int64))
 Base.typemax{P<:Period}(::Type{P}) = P(typemax(Int64))
 
 # Default values (as used by TimeTypes)
 """
     default(p::Period) -> Period
 
-Returns a sensible "default" value for the input Period by returning `one(p)` for Year,
-Month, and Day, and `zero(p)` for Hour, Minute, Second, and Millisecond.
+Returns a sensible "default" value for the input Period by returning `T(1)` for Year,
+Month, and Day, and `T(0)` for Hour, Minute, Second, and Millisecond.
 """
 function default end
 
-default{T<:DatePeriod}(p::Union{T,Type{T}}) = one(p)
+default{T<:DatePeriod}(p::Union{T,Type{T}}) = T(1)
 default{T<:TimePeriod}(p::Union{T,Type{T}}) = zero(p)
 
 (-){P<:Period}(x::P) = P(-value(x))

base/deprecated.jl

@@ -1499,4 +1499,8 @@ end
 # Calling promote_op is likely a bad idea, so deprecate its convenience wrapper promote_eltype_op
 @deprecate promote_eltype_op(op, As...) promote_op(op, map(eltype, As)...)
 
+# These conversions should not be defined, see #19896
+Base.convert{T<:Number}(::Type{T},x::Dates.Period) = error("conversion between Periods and Numbers is not defined")
+Base.convert{T<:Dates.Period}(::Type{T},x::Real) = error("conversion between Periods and Numbers is not defined")
+
 # End deprecations scheduled for 0.6

test/dates/conversions.jl

@@ -61,11 +61,10 @@ let t = Dates.Period[Dates.Week(2), Dates.Day(14), Dates.Hour(14*24), Dates.Minu
         Pi = typeof(t[i])
         for j = 1:length(t)
             @test t[i] == t[j]
-            @test Int(convert(Pi,t[j])) == Int(t[i])
         end
         for j = i+1:length(t)
             Pj = typeof(t[j])
-            tj1 = t[j] + one(Pj)
+            tj1 = t[j] + Pj(1)
             @test t[i] < tj1
             @test_throws InexactError Pi(tj1)
             @test_throws InexactError Pj(Pi(typemax(Int64)))
@@ -74,8 +73,7 @@ let t = Dates.Period[Dates.Week(2), Dates.Day(14), Dates.Hour(14*24), Dates.Minu
     end
 end
 @test Dates.Year(3) == Dates.Month(36)
-@test Int(convert(Dates.Month, Dates.Year(3))) == 36
-@test Int(convert(Dates.Year, Dates.Month(36))) == 3
+@test_throws ErrorException Int(Dates.Month(36))  # eventually change to MethodError
 @test Dates.Year(3) < Dates.Month(37)
 @test_throws InexactError convert(Dates.Year, Dates.Month(37))
 @test_throws InexactError Dates.Month(Dates.Year(typemax(Int64)))
@@ -103,4 +101,3 @@ b = Dates.Date(2000)
 @test convert(Date,730120) == b
 @test convert(Date,730120.0) == b
 @test convert(Date,Int32(730120)) == b
-

test/dates/periods.jl

@@ -57,23 +57,6 @@ ms = Dates.Millisecond(1)
 @test Dates.Minute(mi) == mi
 @test Dates.Second(s) == s
 @test Dates.Millisecond(ms) == ms
-@test typeof(Int8(y)) <: Int8
-@test typeof(UInt8(y)) <: UInt8
-@test typeof(Int16(y)) <: Int16
-@test typeof(UInt16(y)) <: UInt16
-@test typeof(Int32(y)) <: Int32
-@test typeof(UInt32(y)) <: UInt32
-@test typeof(Int64(y)) <: Int64
-@test typeof(UInt64(y)) <: UInt64
-@test typeof(Int128(y)) <: Int128
-@test typeof(UInt128(y)) <: UInt128
-@test typeof(convert(BigInt,y)) <: BigInt
-@test typeof(convert(BigFloat,y)) <: BigFloat
-@test typeof(convert(Complex,y)) <: Complex
-@test typeof(convert(Rational,y)) <: Rational
-@test typeof(Float16(y)) <: Float16
-@test typeof(Float32(y)) <: Float32
-@test typeof(Float64(y)) <: Float64
 @test Dates.Year(convert(Int8,1)) == y
 @test Dates.Year(convert(UInt8,1)) == y
 @test Dates.Year(convert(Int16,1)) == y
@@ -214,20 +197,6 @@ test = ((((((((dt + y) - m) + w) - d) + h) - mi) + s) - ms)
 @test zero(Dates.Second(10)) == Dates.Second(0)
 @test zero(Dates.Millisecond) == Dates.Millisecond(0)
 @test zero(Dates.Millisecond(10)) == Dates.Millisecond(0)
-@test one(Dates.Year) == Dates.Year(1)
-@test one(Dates.Year(10)) == Dates.Year(1)
-@test one(Dates.Month) == Dates.Month(1)
-@test one(Dates.Month(10)) == Dates.Month(1)
-@test one(Dates.Day) == Dates.Day(1)
-@test one(Dates.Day(10)) == Dates.Day(1)
-@test one(Dates.Hour) == Dates.Hour(1)
-@test one(Dates.Hour(10)) == Dates.Hour(1)
-@test one(Dates.Minute) == Dates.Minute(1)
-@test one(Dates.Minute(10)) == Dates.Minute(1)
-@test one(Dates.Second) == Dates.Second(1)
-@test one(Dates.Second(10)) == Dates.Second(1)
-@test one(Dates.Millisecond) == Dates.Millisecond(1)
-@test one(Dates.Millisecond(10)) == Dates.Millisecond(1)
 @test Dates.Year(-1) < Dates.Year(1)
 @test !(Dates.Year(-1) > Dates.Year(1))
 @test Dates.Year(1) == Dates.Year(1)