1 files changed, 10 insertions, 10 deletions
diff --git a/src/engine/SCons/SConsignTests.py b/src/engine/SCons/SConsignTests.py
index 8d883c5..38c953b 100644
--- a/src/engine/SCons/SConsignTests.py
+++ b/src/engine/SCons/SConsignTests.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/SConsignTests.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/engine/SCons/SConsignTests.py 5023 2010/06/14 22:05:46 scons"
 
 import os
 import sys
@@ -32,11 +32,11 @@ import SCons.dblite
 
 import SCons.SConsign
 
-class BuildInfo:
+class BuildInfo(object):
     def merge(self, object):
         pass
 
-class DummySConsignEntry:
+class DummySConsignEntry(object):
     def __init__(self, name):
         self.name = name
         self.binfo = BuildInfo()
@@ -45,12 +45,12 @@ class DummySConsignEntry:
     def convert_from_sconsign(self, dir, name):
         self.c_from_s = 1
 
-class FS:
+class FS(object):
     def __init__(self, top):
         self.Top = top
         self.Top.repositories = []
 
-class DummyNode:
+class DummyNode(object):
     def __init__(self, path='not_a_valid_path', binfo=None):
         self.path = path
         self.tpath = path
@@ -143,14 +143,14 @@ class BaseTestCase(SConsignTestCase):
         except KeyError:
             pass
         else:
-            raise "unexpected entry %s" % e
+            raise Exception("unexpected entry %s" % e)
 
         try:
             e = f.get_entry('bbb')
         except KeyError:
             pass
         else:
-            raise "unexpected entry %s" % e
+            raise Exception("unexpected entry %s" % e)
 
         f.merge()
 
@@ -309,7 +309,7 @@ class SConsignFileTestCase(SConsignTestCase):
         assert SCons.SConsign.DB_Name is file, SCons.SConsign.DB_Name
         assert SCons.SConsign.DB_Module is None, SCons.SConsign.DB_Module
 
-        class Fake_DBM:
+        class Fake_DBM(object):
             def open(self, name, mode):
                 self.name = name
                 self.mode = mode
@@ -343,7 +343,7 @@ class writeTestCase(SConsignTestCase):
         test = self.test
         file = test.workpath('sconsign_file')
 
-        class Fake_DBM:
+        class Fake_DBM(object):
             def __getitem__(self, key):
                 return None
             def __setitem__(self, key, value):
@@ -386,7 +386,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)