Skip to content

Commit

Permalink
deprecate Dates.ismonday, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonbyrne
simonbyrne committed Nov 17, 2016
1 parent 5f98d99 commit 7de7c64
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 42 deletions.
9 changes: 0 additions & 9 deletions base/dates/query.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,6 @@ in the given `locale`.
"""
dayabbr(dt::TimeType;locale::AbstractString="english") = VALUETODAYOFWEEKABBR[locale][DayOfWeek(dt)]

# Convenience methods for each day
ismonday(dt::TimeType) = DayOfWeek(dt) == Mon
istuesday(dt::TimeType) = DayOfWeek(dt) == Tue
iswednesday(dt::TimeType) = DayOfWeek(dt) == Wed
isthursday(dt::TimeType) = DayOfWeek(dt) == Thu
isfriday(dt::TimeType) = DayOfWeek(dt) == Fri
issaturday(dt::TimeType) = DayOfWeek(dt) == Sat
issunday(dt::TimeType) = DayOfWeek(dt) == Sun

# i.e. 1st Monday? 2nd Monday? 3rd Wednesday? 5th Sunday?
"""
dayofweekofmonth(dt::TimeType) -> Int
Expand Down
8 changes: 8 additions & 0 deletions base/deprecated.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,7 @@ eval(Base.Dates, quote
end
end
recur{T<:TimeType}(fun::Function, start::T, stop::T; step::Period=Day(1), negate::Bool=false, limit::Int=10000) = recur(fun, start:step:stop; negate=negate)
end)

# #19212
eval(Base.Dates,quote
Expand All @@ -1143,6 +1144,13 @@ eval(Base.Dates,quote
dayname(DayOfWeek(dt); locale=locale))
@deprecate(dayabbr(dt::Integer;locale::AbstractString="english"),
dayabbr(DayOfWeek(dt); locale=locale))
@deprecate(ismonday(dt::TimeType), DayOfWeek(dt) == Mon)
@deprecate(istuesday(dt::TimeType), DayOfWeek(dt) == Tue)
@deprecate(iswednesday(dt::TimeType), DayOfWeek(dt) == Wed)
@deprecate(isthursday(dt::TimeType), DayOfWeek(dt) == Thu)
@deprecate(isfriday(dt::TimeType), DayOfWeek(dt) == Fri)
@deprecate(issaturday(dt::TimeType), DayOfWeek(dt) == Sat)
@deprecate(issunday(dt::TimeType), DayOfWeek(dt) == Sun)
end)

# End deprecations scheduled for 0.6
66 changes: 33 additions & 33 deletions test/dates/adjusters.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@ end

# Adjusters
# Adjuster Constructors
@test Dates.Date(Dates.ismonday,2014) == Dates.Date(2014,1,6)
@test Dates.Date(Dates.ismonday,2014,5) == Dates.Date(2014,5,5)
@test Dates.Date(x->Dates.DayOfWeek(x)==Dates.Mon,2014) == Dates.Date(2014,1,6)
@test Dates.Date(x->Dates.DayOfWeek(x)==Dates.Mon,2014,5) == Dates.Date(2014,5,5)

@test Dates.DateTime(Dates.ismonday,2014) == Dates.DateTime(2014,1,6)
@test Dates.DateTime(Dates.ismonday,2014,5) == Dates.DateTime(2014,5,5)
@test Dates.DateTime(x->Dates.DayOfWeek(x)==Dates.Mon,2014) == Dates.DateTime(2014,1,6)
@test Dates.DateTime(x->Dates.DayOfWeek(x)==Dates.Mon,2014,5) == Dates.DateTime(2014,5,5)
@test Dates.DateTime(x->Dates.hour(x)==12,2014,5,21) == Dates.DateTime(2014,5,21,12)
@test Dates.DateTime(x->Dates.minute(x)==30,2014,5,21,12) == Dates.DateTime(2014,5,21,12,30)
@test Dates.DateTime(x->Dates.second(x)==30,2014,5,21,12,30) == Dates.DateTime(2014,5,21,12,30,30)
Expand All @@ -230,35 +230,35 @@ dt = Dates.Date(2014,5,21)
@test Dates.tonext(Dates.Date(0),Dates.Mon) == Dates.Date(0,1,3)

#test func, diff steps, negate, same
@test Dates.tonext(Dates.iswednesday,dt) == Dates.Date(2014,5,28)
@test Dates.tonext(Dates.iswednesday,dt;same=true) == dt
@test Dates.tonext(Dates.isthursday,dt) == Dates.Date(2014,5,22)
@test Dates.tonext(Dates.isfriday,dt) == Dates.Date(2014,5,23)
@test Dates.tonext(Dates.issaturday,dt) == Dates.Date(2014,5,24)
@test Dates.tonext(Dates.issunday,dt) == Dates.Date(2014,5,25)
@test Dates.tonext(Dates.ismonday,dt) == Dates.Date(2014,5,26)
@test Dates.tonext(Dates.istuesday,dt) == Dates.Date(2014,5,27)
@test Dates.tonext(Dates.ismonday,Dates.Date(0)) == Dates.Date(0,1,3)

@test Dates.tonext(x->!Dates.iswednesday(x),dt;negate=true) == Dates.Date(2014,5,28)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt) == Dates.Date(2014,5,28)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;same=true) == dt
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Thu,dt) == Dates.Date(2014,5,22)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Fri,dt) == Dates.Date(2014,5,23)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Sat,dt) == Dates.Date(2014,5,24)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Sun,dt) == Dates.Date(2014,5,25)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Mon,dt) == Dates.Date(2014,5,26)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Tue,dt) == Dates.Date(2014,5,27)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Mon,Dates.Date(0)) == Dates.Date(0,1,3)

@test Dates.tonext(x->Dates.DayOfWeek(x)!=Dates.Wed,dt;negate=true) == Dates.Date(2014,5,28)
# Reach adjust limit
@test_throws ArgumentError Dates.tonext(Dates.iswednesday,dt;limit=6)

@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(2)) == Dates.Date(2014,6,4)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(3)) == Dates.Date(2014,6,11)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(4)) == Dates.Date(2014,6,18)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(5)) == Dates.Date(2014,6,25)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(6)) == Dates.Date(2014,7,2)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Day(7)) == Dates.Date(2014,5,28)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(1)) == Dates.Date(2014,5,28)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(2)) == Dates.Date(2014,6,4)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(3)) == Dates.Date(2014,6,11)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(4)) == Dates.Date(2014,6,18)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(5)) == Dates.Date(2014,6,25)
@test Dates.tonext(Dates.iswednesday,dt;step=Dates.Week(6)) == Dates.Date(2014,7,2)

@test Dates.tonext(Dates.iswednesday,dt;same=true) == dt
@test Dates.tonext(Dates.isthursday,dt) == Dates.Date(2014,5,22)
@test_throws ArgumentError Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;limit=6)

@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(2)) == Dates.Date(2014,6,4)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(3)) == Dates.Date(2014,6,11)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(4)) == Dates.Date(2014,6,18)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(5)) == Dates.Date(2014,6,25)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(6)) == Dates.Date(2014,7,2)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Day(7)) == Dates.Date(2014,5,28)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(1)) == Dates.Date(2014,5,28)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(2)) == Dates.Date(2014,6,4)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(3)) == Dates.Date(2014,6,11)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(4)) == Dates.Date(2014,6,18)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(5)) == Dates.Date(2014,6,25)
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;step=Dates.Week(6)) == Dates.Date(2014,7,2)

@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Wed,dt;same=true) == dt
@test Dates.tonext(x->Dates.DayOfWeek(x)==Dates.Thu,dt) == Dates.Date(2014,5,22)

#toprev
@test Dates.toprev(dt,Dates.Wed) == Dates.Date(2014,5,14)
Expand Down Expand Up @@ -317,7 +317,7 @@ stopdate = Dates.Date(2014,2,1)
@test length(filter(x->true,stopdate:Dates.Day(-1):startdate)) == 32

Januarymondays2014 = [Dates.Date(2014,1,6),Dates.Date(2014,1,13),Dates.Date(2014,1,20),Dates.Date(2014,1,27)]
@test filter(Dates.ismonday,startdate:stopdate) == Januarymondays2014
@test filter(x->Dates.DayOfWeek(x),startdate:stopdate) == Januarymondays2014

@test_throws MethodError filter((x,y)->x+y,Dates.Date(2013):Dates.Date(2014))
@test_throws MethodError Dates.DateFunction((x,y)->x+y, false, Date(0))
Expand Down

0 comments on commit 7de7c64

Please sign in to comment.