-

cool-RR · cool-RR · commit ed7aa57569d9 · 2013-09-18T23:01:45.000+03:00
diff --git a/source_py2/python_toolbox/nifty_collections/__init__.py b/source_py2/python_toolbox/nifty_collections/__init__.py
@@ -7,7 +7,6 @@
 from .ordered_set import OrderedSet
 from .weak_key_default_dict import WeakKeyDefaultDict
 from .weak_key_identity_dict import WeakKeyIdentityDict
-from .counter import Counter
 from .lazy_tuple import LazyTuple
 
 from .emitting_ordered_set import EmittingOrderedSet
diff --git a/source_py2/python_toolbox/nifty_collections/weak_key_default_dict.py b/source_py2/python_toolbox/nifty_collections/weak_key_default_dict.py
@@ -12,7 +12,8 @@
 from weakref import ref
 
 
-class WeakKeyDefaultDict(UserDict.UserDict, object): #todo: needs testing
+#todo: needs testing
+class WeakKeyDefaultDict(UserDict.UserDict, object):
     '''
     A weak key dictionary which can use a default factory.
     
@@ -91,8 +92,8 @@ def __reduce__(self):
 
            This API is used by pickle.py and copy.py.
         """
-        return \
-            (type(self), (self.default_factory,), None, None, self.iteritems())
+        return (type(self), (self.default_factory,), None, None,
+                self.iteritems())
 
     
     def __delitem__(self, key):
@@ -236,4 +237,7 @@ def update(self, dict=None, **kwargs):
         if len(kwargs):
             self.update(kwargs)
             
-            
+            
+    def __len__(self):
+        return len(self.data)
+              
diff --git a/source_py2/python_toolbox/nifty_collections/weak_key_identity_dict.py b/source_py2/python_toolbox/nifty_collections/weak_key_identity_dict.py
@@ -70,7 +70,7 @@ def __setitem__(self, key, value):
     def copy(self):
         """ D.copy() -> a shallow copy of D """
         new = WeakKeyIdentityDict()
-        for key, value in self.data.items():
+        for key, value in self.data.iteritems():
             o = key()
             if o is not None:
                 new[o] = value
@@ -194,7 +194,12 @@ def update(self, dict=None, **kwargs):
         if dict is not None:
             if not hasattr(dict, "items"):
                 dict = type({})(dict)
-            for key, value in dict.items():
+            for key, value in dict.iteritems():
                 d[IdentityRef(key, self._remove)] = value
         if len(kwargs):
             self.update(kwargs)
+
+
+    def __len__(self):
+        return len(self.data)
+    
diff --git a/source_py2/python_toolbox/sleek_reffing/sleek_ref.py b/source_py2/python_toolbox/sleek_reffing/sleek_ref.py
@@ -8,7 +8,6 @@
 '''
 
 import weakref
-import UserDict
 
 from python_toolbox import cute_inspect
 
diff --git a/source_py3/python_toolbox/arguments_profile.py b/source_py3/python_toolbox/arguments_profile.py
@@ -12,7 +12,6 @@
 from python_toolbox.nifty_collections import OrderedDict
 from python_toolbox import dict_tools
 from python_toolbox import comparison_tools
-import collections
 
 
 class ArgumentsProfile(object):
@@ -93,7 +92,7 @@ def __init__(self, function, *args, **kwargs):
         `*args` and `**kwargs` are the arguments that go into the `function`.
         '''
         
-        if not isinstance(function, collections.Callable):
+        if not callable(function):
             raise Exception('%s is not a callable object.' % function)
         self.function = function
         
@@ -160,7 +159,7 @@ def __init__(self, function, *args, **kwargs):
                           else []
         
         # `dict` that maps from argument name to default value:
-        defaults = OrderedDict(list(zip(defaultful_args, s_defaults)))
+        defaults = OrderedDict(zip(defaultful_args, s_defaults))
         
         defaultful_args_differing_from_defaults = set((
             defaultful_arg for defaultful_arg in defaultful_args
diff --git a/source_py3/python_toolbox/nifty_collections/__init__.py b/source_py3/python_toolbox/nifty_collections/__init__.py
@@ -3,16 +3,11 @@
 
 '''Defines various data types, similarly to the stdlib's `collections`.'''
 
-import collections
-
-
 from .ordered_dict import OrderedDict
 from .ordered_set import OrderedSet
 from .weak_key_default_dict import WeakKeyDefaultDict
 from .weak_key_identity_dict import WeakKeyIdentityDict
 from .lazy_tuple import LazyTuple
 
 from .emitting_ordered_set import EmittingOrderedSet
-from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
-
-Counter = collections.Counter
+from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
diff --git a/source_py3/python_toolbox/nifty_collections/ordered_set.py b/source_py3/python_toolbox/nifty_collections/ordered_set.py
@@ -10,7 +10,7 @@
 
 import collections
 
-KEY, PREV, NEXT = list(range(3))
+KEY, PREV, NEXT = range(3)
 
 
 class OrderedSet(collections.MutableSet):
@@ -74,7 +74,7 @@ def pop(self, last=True):
         """Remove and return an arbitrary set element."""
         if not self:
             raise KeyError('set is empty')
-        key = next(reversed(self)) if last else next(iter(self))
+        key = next(reversed(self) if last else iter(self))
         self.discard(key)
         return key
 
diff --git a/source_py3/python_toolbox/nifty_collections/weak_key_default_dict.py b/source_py3/python_toolbox/nifty_collections/weak_key_default_dict.py
@@ -8,12 +8,12 @@
 '''
 # todo: revamp
 
-from weakref import ref
 import collections
+from weakref import ref
 
 
 #todo: needs testing
-class WeakKeyDefaultDict(collections.MutableMapping, object):
+class WeakKeyDefaultDict(collections.MutableMapping):
     '''
     A weak key dictionary which can use a default factory.
     
@@ -36,7 +36,7 @@ def __init__(self, *args, **kwargs):
         self.default_factory = None
         if 'default_factory' in kwargs:
             self.default_factory = kwargs.pop('default_factory')
-        elif len(args) > 0 and isinstance(args[0], collections.Callable):
+        elif len(args) > 0 and callable(args[0]):
             self.default_factory = args[0]
             args = args[1:]
         
@@ -92,8 +92,8 @@ def __reduce__(self):
 
            This API is used by pickle.py and copy.py.
         """
-        return \
-            (type(self), (self.default_factory,), None, None, iter(self.items()))
+        return (type(self), (self.default_factory,), None, None,
+                iter(self.items()))
 
     
     def __delitem__(self, key):
@@ -232,11 +232,12 @@ def update(self, dict=None, **kwargs):
         if dict is not None:
             if not hasattr(dict, "items"):
                 dict = type({})(dict)
-            for key, value in list(dict.items()):
+            for key, value in dict.items():
                 d[ref(key, self._remove)] = value
         if len(kwargs):
             self.update(kwargs)
             
+            
     def __len__(self):
         return len(self.data)
               
diff --git a/source_py3/python_toolbox/nifty_collections/weak_key_identity_dict.py b/source_py3/python_toolbox/nifty_collections/weak_key_identity_dict.py
@@ -27,7 +27,7 @@ def __hash__(self):
         return self._hash
 
 
-class WeakKeyIdentityDict(collections.MutableMapping, object):
+class WeakKeyIdentityDict(collections.MutableMapping):
     """
     A weak key dictionary which cares about the keys' identities.
     
@@ -70,7 +70,7 @@ def __setitem__(self, key, value):
     def copy(self):
         """ D.copy() -> a shallow copy of D """
         new = WeakKeyIdentityDict()
-        for key, value in list(self.data.items()):
+        for key, value in self.data.items():
             o = key()
             if o is not None:
                 new[o] = value
@@ -194,11 +194,12 @@ def update(self, dict=None, **kwargs):
         if dict is not None:
             if not hasattr(dict, "items"):
                 dict = type({})(dict)
-            for key, value in list(dict.items()):
+            for key, value in dict.items():
                 d[IdentityRef(key, self._remove)] = value
         if len(kwargs):
             self.update(kwargs)
 
+
     def __len__(self):
         return len(self.data)
     
diff --git a/source_py3/python_toolbox/sleek_reffing/sleek_ref.py b/source_py3/python_toolbox/sleek_reffing/sleek_ref.py
@@ -8,12 +8,10 @@
 '''
 
 import weakref
-import collections
 
 from python_toolbox import cute_inspect
 
 from .exceptions import SleekRefDied
-import collections
 
 
 __all__ = ['SleekRef']
@@ -54,7 +52,7 @@ def __init__(self, thing, callback=None):
         weakreffable objects.)
         '''
         self.callback = callback
-        if callback and not isinstance(callback, collections.Callable):
+        if callback and not callable(callback):
             raise TypeError('%s is not a callable object.' % callback)
         
         self.is_none = (thing is None)
diff --git a/source_py3/python_toolbox/temp_value_setting/temp_import_hook_setter.py b/source_py3/python_toolbox/temp_value_setting/temp_import_hook_setter.py
@@ -23,7 +23,7 @@ def __init__(self, import_hook):
         
         `import_hook` is the function to be used as the import hook.
         '''
-        assert isinstance(import_hook, collections.Callable)
+        assert callable(import_hook)
         TempValueSetter.__init__(self,
                                  (__builtin__, '__import__'),
                                  value=import_hook)
diff --git a/source_py3/python_toolbox/temp_value_setting/temp_value_setter.py b/source_py3/python_toolbox/temp_value_setting/temp_value_setter.py
@@ -9,7 +9,6 @@
 
 from python_toolbox import address_tools
 from python_toolbox.context_management import ContextManager
-import collections
 
 
 __all__ = ['TempValueSetter']
@@ -67,10 +66,10 @@ def __init__(self, variable, value, assert_no_fiddling=True):
                                          first.__delitem__(second))
             ### Finished handling the `(dict, key)` case. ###
             
-        elif isinstance(second, collections.Callable):
+        elif callable(second):
             # `second` is a callable; so we were probably handed a `(getter,
             # setter)` pair.
-            if not isinstance(first, collections.Callable):
+            if not callable(first):
                 raise bad_input_exception
             self.getter, self.setter = first, second
             ### Finished handling the `(getter, setter)` case. ###
diff --git a/source_py3/python_toolbox/tracing_tools/temp_function_call_counter.py b/source_py3/python_toolbox/tracing_tools/temp_function_call_counter.py
@@ -14,7 +14,6 @@
 
 from python_toolbox.temp_value_setting import TempValueSetter
 from .count_calls import count_calls
-import collections
 
 
 class TempFunctionCallCounter(TempValueSetter):
@@ -44,11 +43,11 @@ def __init__(self, function):
             if isinstance(second, str):
                 actual_function = getattr(first, second)
             else:
-                assert isinstance(first, collections.Callable) and isinstance(second, collections.Callable)
+                assert callable(first) and callable(second)
                 actual_function = first() # `first` is the getter in this case.
                 
         else: # not cute_iter_tools.is_iterable(function)
-            assert isinstance(function, collections.Callable)
+            assert callable(function)
             actual_function = function
             try:
                 address = address_tools.object_to_string.get_address(function)
