Merge pull request #274 from azmeuk/comparison

Allow inequalities with newstr and newbytes.

Author: jmadler

src/future/types/newbytes.py

@@ -348,24 +348,24 @@ def __ne__(self, other):
     unorderable_err = 'unorderable types: bytes() and {0}'
 
     def __lt__(self, other):
-        if not isbytes(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newbytes, self).__lt__(other)
+        if isinstance(other, _builtin_bytes):
+            return super(newbytes, self).__lt__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __le__(self, other):
-        if not isbytes(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newbytes, self).__le__(other)
+        if isinstance(other, _builtin_bytes):
+            return super(newbytes, self).__le__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __gt__(self, other):
-        if not isbytes(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newbytes, self).__gt__(other)
+        if isinstance(other, _builtin_bytes):
+            return super(newbytes, self).__gt__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __ge__(self, other):
-        if not isbytes(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newbytes, self).__ge__(other)
+        if isinstance(other, _builtin_bytes):
+            return super(newbytes, self).__ge__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __native__(self):
         # We can't just feed a newbytes object into str(), because

src/future/types/newstr.py

@@ -302,24 +302,28 @@ def __ne__(self, other):
     unorderable_err = 'unorderable types: str() and {0}'
 
     def __lt__(self, other):
-        if not istext(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newstr, self).__lt__(other)
+        if (isinstance(other, unicode) or
+            isinstance(other, bytes) and not isnewbytes(other)):
+            return super(newstr, self).__lt__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __le__(self, other):
-        if not istext(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newstr, self).__le__(other)
+        if (isinstance(other, unicode) or
+            isinstance(other, bytes) and not isnewbytes(other)):
+            return super(newstr, self).__le__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __gt__(self, other):
-        if not istext(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newstr, self).__gt__(other)
+        if (isinstance(other, unicode) or
+            isinstance(other, bytes) and not isnewbytes(other)):
+            return super(newstr, self).__gt__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __ge__(self, other):
-        if not istext(other):
-            raise TypeError(self.unorderable_err.format(type(other)))
-        return super(newstr, self).__ge__(other)
+        if (isinstance(other, unicode) or
+            isinstance(other, bytes) and not isnewbytes(other)):
+            return super(newstr, self).__ge__(other)
+        raise TypeError(self.unorderable_err.format(type(other)))
 
     def __getattribute__(self, name):
         """

tests/test_future/test_str.py

@@ -382,10 +382,6 @@ def test_cmp(self):
             s > 3
         with self.assertRaises(TypeError):
             s < 1000
-        with self.assertRaises(TypeError):
-            s > b'XYZ'
-        with self.assertRaises(TypeError):
-            s < b'XYZ'
         with self.assertRaises(TypeError):
             s <= 3
         with self.assertRaises(TypeError):