Merge commit 'upstream/2.0.0'

1 files changed, 5 insertions, 7 deletions

diff --git a/src/engine/SCons/DefaultsTests.py b/src/engine/SCons/DefaultsTests.py
index 348d54d..20501bc 100644
--- a/src/engine/SCons/DefaultsTests.py
+++ b/src/engine/SCons/DefaultsTests.py
@@ -21,17 +21,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/DefaultsTests.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/engine/SCons/DefaultsTests.py 5023 2010/06/14 22:05:46 scons"
+
+import SCons.compat
 
 import os
-import os.path
-import string
-import StringIO
 import sys
-import types
 import unittest
 
-from UserDict import UserDict
+from collections import UserDict
 
 import TestCmd
 
@@ -83,7 +81,7 @@ if __name__ == "__main__":
                ]
     for tclass in tclasses:
         names = unittest.getTestCaseNames(tclass, 'test_')
-        suite.addTests(map(tclass, names))
+        suite.addTests(list(map(tclass, names)))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)