Upgrade six to 1.9.0

embray · Jul 15, 2015 · c2ccf00 · c2ccf00
1 parent cb9fac0
commit c2ccf00
Show file tree

Hide file tree

Showing 2 changed files with 509 additions and 51 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,12 @@ Changes
   Distribution class (the patched version from setuptools, where d2to1
   needs to get to the unpatched version from distutils for some cases).
 
+- Upgraded bundled copy of the ``six`` module to the current version
+  (1.9.0).  This fixes incompatibility between d2to1 and other packages
+  that import different versions of ``six`` during their setup (the older
+  version of ``six`` had a habit of fighting with other ``six`` instances
+  over ``sys.modules``, which is fixed in newer versions).
+
 
 0.2.11 (2013-08-29)
 -------------------