diff options
Diffstat (limited to 'src/engine/SCons/compat/__init__.py')
-rw-r--r-- | src/engine/SCons/compat/__init__.py | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index 0b70c5d..7e93a71 100644 --- 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: |