Supporting Python 2.6

cool-RR · cool-RR · commit 0ae75e79a127 · 2015-07-18T21:29:12.000+03:00
diff --git a/LICENSE b/LICENSE
@@ -25,6 +25,5 @@ Python Toolbox includes third-party Python packages as subpackages that are used
  * `linecache2` by "Testing-cabal" and others, PSF license.
  * `traceback2` by "Testing-cabal" and others, PSF license.
  * `six` by Benjamin Peterson and others, MIT license.
- * `ordereddict` by Raymond Hettinger and others, MIT license.
- * `functools` by Python-dev and others, PSF license.
+ * `functools` and `collections` by Python-dev and others, PSF license.
 
diff --git a/README.markdown b/README.markdown
@@ -84,8 +84,7 @@ Python Toolbox includes third-party Python packages as subpackages that are used
  * `linecache2` by "Testing-cabal" and others, PSF license.
  * `traceback2` by "Testing-cabal" and others, PSF license.
  * `six` by Benjamin Peterson and others, MIT license.
- * `ordereddict` by Raymond Hettinger and others, MIT license.
- * `functools` by Python-dev and others, PSF license.
+ * `functools` and `collections` by Python-dev and others, PSF license.
 
 
 ------------------------------------------------------------------
diff --git a/source_py2/python_toolbox/MIT_license.txt b/source_py2/python_toolbox/MIT_license.txt
@@ -25,5 +25,4 @@ Python Toolbox includes third-party Python packages as subpackages that are used
  * `linecache2` by "Testing-cabal" and others, PSF license.
  * `traceback2` by "Testing-cabal" and others, PSF license.
  * `six` by Benjamin Peterson and others, MIT license.
- * `ordereddict` by Raymond Hettinger and others, MIT license.
- * `functools` by Python-dev and others, PSF license.
+ * `functools` and `collections` by Python-dev and others, PSF license.
diff --git a/source_py2/python_toolbox/nifty_collections/abstract.py b/source_py2/python_toolbox/nifty_collections/abstract.py
@@ -5,7 +5,7 @@
 import collections
 import Queue as queue
 import multiprocessing.queues
-import python_toolbox.third_party.ordereddict
+import python_toolbox.third_party.collections
 
 
 ###############################################################################
@@ -29,7 +29,7 @@ class Ordered():
 except AttributeError:
     # Python 2.6
     pass
-Ordered.register(python_toolbox.third_party.ordereddict.OrderedDict)
+Ordered.register(python_toolbox.third_party.collections.OrderedDict)
 Ordered.register(collections.deque)
 Ordered.register(queue.Queue)
 Ordered.register(multiprocessing.queues.Queue)
@@ -53,7 +53,7 @@ def __subclasshook__(cls, type_):
             OrderedDict = collections.OrderedDict
         except AttributeError:
             # Python 2.6
-            OrderedDict = python_toolbox.third_party.ordereddict.OrderedDict
+            OrderedDict = python_toolbox.third_party.collections.OrderedDict
         if cls is DefinitelyUnordered and issubclass(type_, OrderedDict):
             return False
         else:
diff --git a/source_py2/python_toolbox/nifty_collections/ordered_dict.py b/source_py2/python_toolbox/nifty_collections/ordered_dict.py
@@ -7,7 +7,7 @@
 try:
     from collections import OrderedDict as StdlibOrderedDict
 except ImportError:
-    from python_toolbox.third_party.ordereddict import OrderedDict \
+    from python_toolbox.third_party.collections import OrderedDict \
                                                            as StdlibOrderedDict
 
 
diff --git a/source_py2/python_toolbox/third_party/ordereddict.py b/source_py2/python_toolbox/third_party/ordereddict.py
diff --git a/source_py3/python_toolbox/MIT_license.txt b/source_py3/python_toolbox/MIT_license.txt
@@ -25,6 +25,4 @@ Python Toolbox includes third-party Python packages as subpackages that are used
  * `linecache2` by "Testing-cabal" and others, PSF license.
  * `traceback2` by "Testing-cabal" and others, PSF license.
  * `six` by Benjamin Peterson and others, MIT license.
- * `ordereddict` by Raymond Hettinger and others, MIT license.
- * `functools` by Python-dev and others, PSF license.
-
+ * `functools` and `collections` by Python-dev and others, PSF license.
