Merge pull request Unidata#252 from takluyver/datetime-compare

Jeff Whitaker · Jeff Whitaker · commit 2e5c30a02b84 · 2014-05-06T16:09:53.000-06:00
Make datetime objects comparable
diff --git a/netcdftime.py b/netcdftime.py
@@ -52,6 +52,16 @@ def __repr__(self):
         return self.strftime(self.format)
     def __eq__(self, date):
         return self.strftime('%Y-%m-%d %H:%M:%S') == date.strftime('%Y-%m-%d %H:%M:%S')
+    
+    def __lt__(self, other):
+        if isinstance(other, (datetime, real_datetime)):
+            return self.strftime('%Y-%m-%d %H:%M:%S') < other.strftime('%Y-%m-%d %H:%M:%S')
+        return NotImplemented
+    
+    def __gt__(self, other):
+        if isinstance(other, (datetime, real_datetime)):
+            return self.strftime('%Y-%m-%d %H:%M:%S') > other.strftime('%Y-%m-%d %H:%M:%S')
+        return NotImplemented
 
 
 def JulianDayFromDate(date,calendar='standard'):
diff --git a/test/tst_netcdftime.py b/test/tst_netcdftime.py
@@ -184,6 +184,13 @@ def runTest(self):
         # check timezone offset
         d = datetime(2012,2,29,15)
         assert(self.cdftime_mixed.date2num(d)-self.cdftime_mixed_tz.date2num(d) == 6)
+        
+        # Check comparisons with Python datetime types
+        d1 = num2date(0, 'days since 1000-01-01', 'standard')
+        d2 = datetime(2000, 1, 1)
+        d3 = num2date(0, 'days since 3000-01-01', 'standard')
+        assert d1 < d2
+        assert d2 < d3
 
 
 class TestDate2index(unittest.TestCase):
