-

cool-RR · cool-RR · commit 8e43980ad735 · 2014-10-20T18:38:46.000+03:00
diff --git a/source_py2/python_toolbox/cute_iter_tools.py b/source_py2/python_toolbox/cute_iter_tools.py
@@ -14,6 +14,7 @@
 import numbers
 
 from python_toolbox import sequence_tools
+from python_toolbox import misc_tools
 from python_toolbox import math_tools
 
 infinity = float('inf')
@@ -374,7 +375,7 @@ def _call_until_exception(function, exception):
 
 
 @misc_tools.limit_positional_arguments(1)    
-def get_single_if_any(iterable, *, 
+def get_single_if_any(iterable,
                       exception_on_multiple=True, none_on_multiple=False):
     '''
     Get the single item of `iterable`, if any.
@@ -415,7 +416,7 @@ def get_single_if_any(iterable, *,
             return first_item        
         
         
-def are_equal(*sequences, easy_types=(sequence_tools.CuteRange,)):
+def are_equal(*sequences, **kwargs):
     '''
     Are the given sequences equal?
     
@@ -430,6 +431,8 @@ def are_equal(*sequences, easy_types=(sequence_tools.CuteRange,)):
     from python_toolbox import logic_tools
     sequence_types = set(map(type, sequences))
     
+    easy_types = kwargs.get('easy_types', (sequence_tools.CuteRange,))
+    
     # Trying cheap comparison:
     if len(sequence_types) == 1 and issubclass(
                                 get_single_if_any(sequence_types), easy_types):
@@ -448,7 +451,8 @@ def are_equal(*sequences, easy_types=(sequence_tools.CuteRange,)):
         return True
 
     
-def is_sorted(iterable, *, rising=True, strict=False, key=None):
+@misc_tools.limit_positional_arguments(1)
+def is_sorted(iterable, rising=True, strict=False, key=None):
     '''
     Is `iterable` sorted?
     
diff --git a/source_py2/python_toolbox/math_tools/types.py b/source_py2/python_toolbox/math_tools/types.py
@@ -14,19 +14,19 @@ class _PossiblyInfiniteIntegralType(abc.ABCMeta):
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Integral) or (thing in infinities)
 class PossiblyInfiniteIntegral(numbers.Number):
-    __metaclass__ =_PossiblyInfiniteIntegralType
+    __metaclass__ = _PossiblyInfiniteIntegralType
     '''An integer or infinity (including negative infinity.)'''
 
 class _PossiblyInfiniteRealType(abc.ABCMeta):
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Real) or (thing in infinities)
 class PossiblyInfiniteReal(numbers.Number):
-    __metaclass__ =__PossiblyInfiniteRealType
+    __metaclass__ = _PossiblyInfiniteRealType
     '''A real number or infinity (including negative infinity.)'''
 
 class _NaturalType(abc.ABCMeta):
     def __instancecheck__(self, thing):
         return isinstance(thing, numbers.Integral) and thing >= 1
 class Natural(numbers.Number):
-    __metaclass__ =__NaturalType
+    __metaclass__ = _NaturalType
     '''A natural number, meaning a positive integer (0 not included.)'''
diff --git a/source_py2/python_toolbox/misc_tools/misc_tools.py b/source_py2/python_toolbox/misc_tools/misc_tools.py
@@ -14,6 +14,8 @@
 import sys
 import threading
 
+from python_toolbox import decorator_tools
+
 
 _email_pattern = re.compile(
     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"
