Update upstream source from tag 'upstream/3.1.0'

Update to upstream version '3.1.0'
with Debian dir e69b7671114411c368722827d87d86b44ed7cd40

1 files changed, 9 insertions, 18 deletions

diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index 1e744e4..dcbd8e8 100644
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -57,31 +57,22 @@ function defined below loads the module as the "real" name (without the
 rest of our code will find our pre-loaded compatibility module.
 """
 
-__revision__ = "src/engine/SCons/compat/__init__.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog"
+__revision__ = "src/engine/SCons/compat/__init__.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
 
 import os
 import sys
-import imp  # Use the "imp" module to protect imports from fixers.
+import importlib
 
 PYPY = hasattr(sys, 'pypy_translation_info')
 
 
-def import_as(module, name):
-    """
-    Imports the specified module (from our local directory) as the
-    specified name, returning the loaded module object.
-    """
-    dir = os.path.split(__file__)[0]
-    return imp.load_module(name, *imp.find_module(module, [dir]))
-
-
 def rename_module(new, old):
     """
-    Attempts to import the old module and load it under the new name.
+    Attempt to import the old module and load it under the new name.
     Used for purely cosmetic name changes in Python 3.x.
     """
     try:
-        sys.modules[new] = imp.load_module(old, *imp.find_module(old))
+        sys.modules[new] = importlib.import_module(old)
         return True
     except ImportError:
         return False
@@ -122,28 +113,28 @@ except AttributeError:
     # intern into the sys package
     sys.intern = intern
 
-# Preparing for 3.x. UserDict, UserList, UserString are in
-# collections for 3.x, but standalone in 2.7.x
+# UserDict, UserList, UserString are in # collections for 3.x,
+# but standalone in 2.7.x. Monkey-patch into collections for 2.7.
 import collections
 
 try:
     collections.UserDict
 except AttributeError:
-    exec ('from UserDict import UserDict as _UserDict')
+    from UserDict import UserDict as _UserDict
     collections.UserDict = _UserDict
     del _UserDict
 
 try:
     collections.UserList
 except AttributeError:
-    exec ('from UserList import UserList as _UserList')
+    from UserList import UserList as _UserList
     collections.UserList = _UserList
     del _UserList
 
 try:
     collections.UserString
 except AttributeError:
-    exec ('from UserString import UserString as _UserString')
+    from UserString import UserString as _UserString
     collections.UserString = _UserString
     del _UserString