Issue 2334: Use compatibility versions of collections.User{Dict,List,String}

[scons.git] / src / engine / SCons / compat / __init__.py

diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index 0b70c5d16d0efc549087a412e5e9f26ee71e5d21..7e93a71efa73355a7d493a5082a4876fabb1aef1 100644 (file)
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -96,6 +96,28 @@ except NameError:
     import __builtin__, sets
     __builtin__.set = sets.Set
 
+
+import collections
+try:
+    collections.UserDict
+except AttributeError:
+    import UserDict
+    collections.UserDict = UserDict.UserDict
+    del UserDict
+try:
+    collections.UserList
+except AttributeError:
+    import UserList
+    collections.UserList = UserList.UserList
+    del UserList
+try:
+    collections.UserString
+except AttributeError:
+    import UserString
+    collections.UserString = UserString.UserString
+    del UserString
+
+
 import fnmatch
 try:
     fnmatch.filter
@@ -267,11 +289,6 @@ except AttributeError:
     # Wrapping sys in () is silly, but protects it from 2to3 renames fixer
     sys.maxsize = (sys).maxint
 
-try:
-    import UserString
-except ImportError:
-    # Pre-1.6 Python has no UserString module.
-    import_as('_scons_UserString', 'UserString')
 
 import tempfile
 try: