Fix regression tests (imports not happening as expected)

2 files changed, 2 insertions, 15 deletions

diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 0531f90..782de75 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -949,7 +949,7 @@ class Taskmaster:
                 T.write(self.trace_message('       removing node %s from the pending children set\n' %
                         self.trace_node(n)))
         try:
-            while True:
+            while len(to_visit):
                 node = to_visit.pop()
                 node_func(node)
 
diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py
index 06cdf42..bfa8384 100644
--- a/src/engine/SCons/compat/__init__.py
+++ b/src/engine/SCons/compat/__init__.py
@@ -80,7 +80,7 @@ def rename_module(new, old):
     Used for purely cosmetic name changes in Python 3.x.
     """
     try:
-        sys.modules[new] = imp.load_module(new, *imp.find_module(old))
+        sys.modules[new] = imp.load_module(old, *imp.find_module(old))
         return True
     except ImportError:
         return False
@@ -140,19 +140,6 @@ else:
 
 
 try:
-    import dbm
-except ImportError:
-    dbm = import_as('_scons_dbm', 'dbm')
-try:
-    dbm.whichdb
-except AttributeError:
-    # Pre-3.0 Python has no dbm.whichdb function.
-    import whichdb
-    dbm.whichdb = whichdb.whichdb
-    del whichdb
-
-
-try:
     import io
 except ImportError:
     # Pre-2.6 Python has no io module.