Imported Upstream version 2.0.0upstream/2.0.0

1 files changed, 5 insertions, 5 deletions

diff --git a/src/engine/SCons/CacheDirTests.py b/src/engine/SCons/CacheDirTests.py
index 1bac2bc..c741ab7 100644
--- a/src/engine/SCons/CacheDirTests.py
+++ b/src/engine/SCons/CacheDirTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/CacheDirTests.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/engine/SCons/CacheDirTests.py 5023 2010/06/14 22:05:46 scons"
 
 import os.path
 import shutil
@@ -34,7 +34,7 @@ import SCons.CacheDir
 
 built_it = None
 
-class Action:
+class Action(object):
     def __call__(self, targets, sources, env, **kw):
         global built_it
         if kw.get('execute', 1):
@@ -45,7 +45,7 @@ class Action:
     def get_contents(self, target, source, env):
         return ''
 
-class Builder:
+class Builder(object):
     def __init__(self, environment, action):
         self.env = environment
         self.action = action
@@ -53,7 +53,7 @@ class Builder:
         self.source_scanner = None
         self.target_scanner = None
 
-class Environment:
+class Environment(object):
     def __init__(self, cachedir):
         self.cachedir = cachedir
     def Override(self, overrides):
@@ -286,7 +286,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)