-

cool-RR · cool-RR · commit 002adf829a21 · 2014-09-24T16:13:04.000+03:00
diff --git a/source_py2/python_toolbox/cute_iter_tools.py b/source_py2/python_toolbox/cute_iter_tools.py
@@ -403,15 +403,13 @@ def are_equal(*sequences):
     from python_toolbox import logic_tools
     sequence_types = set(map(type, sequences))
     
-    if not sys_tools.is_pypy: # Hack around Pypy bug 1799
-        # Trying cheap comparison:
-        if len(sequence_types) == 1 and issubclass(
-                 get_single_if_any(sequence_types), collections.Sequence) and \
-                               not get_single_if_any(sequence_types) == xrange:
-            # (Excluding `xrange` from this fast check because it has no
-            # `__eq__`.)
-            
-            return logic_tools.all_equal(sequences)
+    # Trying cheap comparison:
+    if len(sequence_types) == 1 and issubclass(
+             get_single_if_any(sequence_types), collections.Sequence) and \
+                           not get_single_if_any(sequence_types) == xrange:
+        # (Excluding `xrange` from this fast check because it has no
+        # `__eq__`.)
+        return logic_tools.all_equal(sequences)
     
     # If cheap comparison didn't work, trying item-by-item comparison:
     zipped = itertools.izip_longest(*sequences,
diff --git a/source_py3/python_toolbox/cute_iter_tools.py b/source_py3/python_toolbox/cute_iter_tools.py
@@ -400,15 +400,11 @@ def are_equal(*sequences):
     from python_toolbox import logic_tools
     sequence_types = set(map(type, sequences))
     
-    if not sys_tools.is_pypy: # Hack around Pypy bug 1799
-        # Trying cheap comparison:
-        if len(sequence_types) == 1 and issubclass(
-                      get_single_if_any(sequence_types), collections.Sequence):
-            
-            return logic_tools.all_equal(sequences)
-    # blocktodo: test on pypy and hopefully remove these two lines if not needed
-    # if sequence_types == {CuteCount}: # Hack around Pypy bug 1799, remove
-        # return logic_tools.all_equal(sequences.start for sequence in sequences)
+    # Trying cheap comparison:
+    if len(sequence_types) == 1 and issubclass(
+                  get_single_if_any(sequence_types), collections.Sequence):
+        
+        return logic_tools.all_equal(sequences)
     
     # If cheap comparison didn't work, trying item-by-item comparison:
     zipped = itertools.zip_longest(*sequences,
diff --git a/source_py3/python_toolbox/math_tools/types.py b/source_py3/python_toolbox/math_tools/types.py
@@ -9,15 +9,13 @@
 
 
 class _PossiblyInfiniteIntegralType(abc.ABCMeta):
-    # blocktodo: use everywhere in python_toolbox
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Integral) or (thing in infinities)
 class PossiblyInfiniteIntegral(numbers.Number,
                                metaclass=_PossiblyInfiniteIntegralType):
     pass
 
 class _PossiblyInfiniteRealType(abc.ABCMeta):
-    # blocktodo: use everywhere in python_toolbox
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Real) or (thing in infinities)
 class PossiblyInfiniteReal(numbers.Number,
