Fixes Pendulum instances comparison to unsupported types.

Removes support for comparison to int, floats and integers.

Author: sdispater

CHANGELOG.md

@@ -2,10 +2,15 @@
 
 ## [Unreleased]
 
+### Changed
+
+- `Pendulum` instances can no longer be compared to strings and integers.
+
 ### Fixed
 
 - Fixes `Timezone._convert()` method for fixed timezones.
 - Fixes `instances()` for some `tzinfo`.
+- Fixes comparisons to incompatible objects raising an error.
 
 
 ## [0.6.0] - 2016-09-12

pendulum/pendulum.py

@@ -1092,22 +1092,40 @@ def to_w3c_string(self):
 
     # Comparisons
     def __eq__(self, other):
-        return self._datetime == self._get_datetime(other)
+        try:
+            return self._datetime == self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def __ne__(self, other):
-        return self._datetime != self._get_datetime(other)
+        try:
+            return self._datetime != self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def __gt__(self, other):
-        return self._datetime > self._get_datetime(other)
+        try:
+            return self._datetime > self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def __ge__(self, other):
-        return self._datetime >= self._get_datetime(other)
+        try:
+            return self._datetime >= self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def __lt__(self, other):
-        return self._datetime < self._get_datetime(other)
+        try:
+            return self._datetime < self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def __le__(self, other):
-        return self._datetime <= self._get_datetime(other)
+        try:
+            return self._datetime <= self._get_datetime(other)
+        except ValueError:
+            return NotImplemented
 
     def between(self, dt1, dt2, equal=True):
         """
@@ -2110,20 +2128,6 @@ def _get_datetime(self, value, pendulum=False):
 
             return value if not pendulum else Pendulum.instance(value)
 
-        if isinstance(value, (int, float)):
-            d = Pendulum.create_from_timestamp(value, self.timezone)
-            if pendulum:
-                return d
-
-            return d._datetime
-
-        if isinstance(value, basestring):
-            d = Pendulum.parse(value, tz=self.timezone)
-            if pendulum:
-                return d
-
-            return d._datetime
-
         raise ValueError('Invalid datetime "{}"'.format(value))
 
     def for_json(self):
@@ -2138,10 +2142,16 @@ def __sub__(self, other):
         if isinstance(other, datetime.timedelta):
             return self.subtract_timedelta(other)
 
-        return self._get_datetime(other, True).diff(self, False)
+        try:
+            return self._get_datetime(other, True).diff(self, False)
+        except ValueError:
+            return NotImplemented
 
     def __rsub__(self, other):
-        return self.diff(self._get_datetime(other, True), False)
+        try:
+            return self.diff(self._get_datetime(other, True), False)
+        except ValueError:
+            return NotImplemented
 
     def __add__(self, other):
         if not isinstance(other, datetime.timedelta):

tests/pendulum_tests/test_comparison.py

@@ -14,15 +14,9 @@ def test_equal_to_true(self):
         d1 = Pendulum(2000, 1, 1, 1, 2, 3)
         d2 = Pendulum(2000, 1, 1, 1, 2, 3)
         d3 = datetime(2000, 1, 1, 1, 2, 3)
-        d4 = 946688523
-        d5 = 946688523.0
-        d6 = '2000-01-01 01:02:03'
 
         self.assertEqual(d1, d2)
         self.assertEqual(d1, d3)
-        self.assertEqual(d1, d4)
-        self.assertEqual(d1, d5)
-        self.assertEqual(d1, d6)
 
     def test_equal_to_false(self):
         d1 = Pendulum(2000, 1, 1, 1, 2, 3)
@@ -427,3 +421,9 @@ def test_is_same_day(self):
         self.assertTrue(dt1.is_same_day(dt3))
         self.assertTrue(dt1.is_same_day(dt4))
         self.assertFalse(dt1.is_same_day(dt5))
+
+    def test_comparison_to_unsupported(self):
+        dt1 = Pendulum.now()
+
+        self.assertFalse(dt1 == 'test')
+        self.assertFalse(dt1 in ['test'])

tests/pendulum_tests/test_sub.py

@@ -88,3 +88,18 @@ def test_subtract_timedelta(self):
         self.assertEqual(11, d.minute)
         self.assertEqual(59, d.second)
         self.assertEqual(123456, d.microsecond)
+
+    def test_subtract_invalid_type(self):
+        d = Pendulum(1975, 5, 21, 0, 0, 0)
+
+        try:
+            d - 'ab'
+            self.fail()
+        except TypeError:
+            pass
+
+        try:
+            'ab' - d
+            self.fail()
+        except TypeError:
+            pass