X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fopdate.py;h=6d230860dcaa3c92d9be8897e04133e801260fd2;hb=e75d2c94f9bd326ebaace635a06599a1be35b024;hp=b28dec67df4fe2e6a33a4baa493f6f6b80db1fd4;hpb=fb3af94919a9ee18ba1c35f927f19837f057fa1f;p=m_lib.git diff --git a/m_lib/opdate.py b/m_lib/opdate.py index b28dec6..6d23086 100755 --- a/m_lib/opdate.py +++ b/m_lib/opdate.py @@ -49,7 +49,7 @@ class opdate_error(Exception): # def IsLeapYear(Year): - if ( (Year % 4 == 0) and (Year % 4000 <> 0) and ((Year % 100 <> 0) or (Year % 400 == 0)) ): + if ( (Year % 4 == 0) and (Year % 4000 != 0) and ((Year % 100 != 0) or (Year % 400 == 0)) ): return True return False @@ -75,7 +75,7 @@ def DaysInMonth(Month, Year): return 28+IsLeapYear(_setYear(Year)) else: - raise opdate_error, "bad month `%s'" % str(Month) + raise opdate_error("bad month `%s'" % str(Month)) def ValidDate(Day, Month, Year): @@ -165,7 +165,7 @@ def IncDate(Julian, Days, Months, Years): Year = Year + 1 Julian = DMYtoDate(Day, Month, Year) - if Julian <> BadDate: + if Julian != BadDate: Julian = Julian + Days + Day28Delta return Julian @@ -191,7 +191,7 @@ def IncDateTrunc(Julian, Months, Years): Year = Year + 1 Julian = DMYtoDate(Day, Month, Year) - if Julian <> BadDate: + if Julian != BadDate: MaxDay = DaysInMonth(Month, Year) if Day+Day28Delta > MaxDay: Julian = Julian + MaxDay-Day @@ -235,7 +235,7 @@ def DateDiff(Date1, Date2): def DayOfWeek(Julian): """ Return the day of the week for the date. Returns DayType(7) if Julian == BadDate. """ if Julian == BadDate: - raise opdate_error, "bad date `%s'" % str(Julian) + raise opdate_error("bad date `%s'" % str(Julian)) else: return (Julian+FirstDayOfWeek) % 7