-

cool-RR · cool-RR · commit 983305ffbcda · 2013-09-14T21:52:47.000+03:00
diff --git a/source_py3/python_toolbox/nifty_collections/__init__.py b/source_py3/python_toolbox/nifty_collections/__init__.py
@@ -3,12 +3,16 @@
 
 '''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 .counter import Counter
 from .lazy_tuple import LazyTuple
 
 from .emitting_ordered_set import EmittingOrderedSet
-from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
+from .emitting_weak_key_default_dict import EmittingWeakKeyDefaultDict
+
+Counter = collections.Counter
diff --git a/source_py3/python_toolbox/nifty_collections/counter.py b/source_py3/python_toolbox/nifty_collections/counter.py
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
 
-import UserDict
 from weakref import ref
 import collections
 
 
-class WeakKeyDefaultDict(UserDict.UserDict, object): #todo: needs testing
+#todo: needs testing
+class WeakKeyDefaultDict(collections.MutableMapping, object):
     '''
     A weak key dictionary which can use a default factory.
     
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
@@ -9,7 +9,7 @@
 # todo: revamp
 
 import weakref
-import UserDict
+import collections
 
 
 __all__ = ['WeakKeyIdentityDict']
@@ -27,7 +27,7 @@ def __hash__(self):
         return self._hash
 
 
-class WeakKeyIdentityDict(UserDict.UserDict, object):
+class WeakKeyIdentityDict(collections.MutableMapping, object):
     """
     A weak key dictionary which cares about the keys' identities.
     
