Skip to content

Fix rich comparisons for datetime objects #53

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

Merged
jswhit merged 3 commits into from
Aug 20, 2018
Merged

Fix rich comparisons for datetime objects #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3ad052
Replace TypeError raise with NotImplemented return in order to get ri…
Jul 9, 2018
f748856
Added a switch to differentiate Python2 and Python3 behaviour. This f…
Jul 24, 2018
29c66d0
Added a comment to to explain the code changes.
Jul 24, 2018
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
13 changes: 12 additions & 1 deletion cftime/_cftime.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import numpy as np
import math
import numpy
import re
import sys
import time
from datetime import datetime as real_datetime
from datetime import timedelta, MINYEAR
Expand Down Expand Up @@ -1615,7 +1616,17 @@ Gregorial calendar.
raise TypeError("cannot compare {0!r} and {1!r} (different calendars)".format(self, other))
return PyObject_RichCompare(dt.to_tuple(), to_tuple(other), op)
else:
raise TypeError("cannot compare {0!r} and {1!r}".format(self, other))
# With Python3 we can use "return NotImplemented". If the other
# object does not have rich comparison instructions for cftime
# then a TypeError is automatically raised. With Python2 in this
# scenario the default behaviour is to compare the object ids
# which will always have a result. Therefore there is no way to
# differentiate between objects that do or do not have legitimate
# comparisons, and so we cannot remove the TypeError below.
if sys.version_info[0] < 3:
raise TypeError("cannot compare {0!r} and {1!r}".format(self, other))
else:
return NotImplemented

cdef _getstate(self):
return (self.year, self.month, self.day, self.hour,
Expand Down