Convert old-style utility classes in unit test files (*Tests.py)

to new-style classes.

3 files changed, 16 insertions, 16 deletions

diff --git a/src/engine/SCons/Node/AliasTests.py b/src/engine/SCons/Node/AliasTests.py
index 6931072..b0efea7 100644
--- a/src/engine/SCons/Node/AliasTests.py
+++ b/src/engine/SCons/Node/AliasTests.py
@@ -51,7 +51,7 @@ class AliasTestCase(unittest.TestCase):
     def test_get_contents(self):
         """Test the get_contents() method
         """
-        class DummyNode:
+        class DummyNode(object):
             def __init__(self, contents):
                 self.contents = contents
             def get_csig(self):
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index db699d3..a301654 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -55,7 +55,7 @@ def _actionAppend(a1, a2):
             raise Exception('Cannot Combine Actions')
     return MyListAction(all)
 
-class MyActionBase:
+class MyActionBase(object):
     def __add__(self, other):
         return _actionAppend(self, other)
 
@@ -82,7 +82,7 @@ class MyAction(MyActionBase):
     def get_implicit_deps(self, target, source, env):
         return []
 
-class MyExecutor:
+class MyExecutor(object):
     def __init__(self, env=None, targets=[], sources=[]):
         self.env = env
         self.targets = targets
@@ -113,7 +113,7 @@ class MyListAction(MyActionBase):
         for A in self.list:
             A(target, source, env)
 
-class Environment:
+class Environment(object):
     def __init__(self, **kw):
         self._dict = {}
         self._dict.update(kw)
@@ -132,7 +132,7 @@ class Environment:
     def get_scanner(self, scanner_key):
         return self._dict['SCANNERS'][0]
 
-class Builder:
+class Builder(object):
     def __init__(self, env=None, is_explicit=1):
         if env is None: env = Environment()
         self.env = env
@@ -166,19 +166,19 @@ class ListBuilder(Builder):
         target = self.nodes[0]
         self.status = Builder.execute(self, target, source, env)
 
-class FailBuilder:
+class FailBuilder(object):
     def execute(self, target, source, env):
         return 1
 
-class ExceptBuilder:
+class ExceptBuilder(object):
     def execute(self, target, source, env):
         raise SCons.Errors.BuildError
 
-class ExceptBuilder2:
+class ExceptBuilder2(object):
     def execute(self, target, source, env):
         raise Exception("foo")
 
-class Scanner:
+class Scanner(object):
     called = None
     def __call__(self, node):
         self.called = 1
@@ -204,10 +204,10 @@ class MyNode(SCons.Node.Node):
     def get_found_includes(self, env, scanner, target):
         return scanner(self)
 
-class Calculator:
+class Calculator(object):
     def __init__(self, val):
         self.max_drift = 0
-        class M:
+        class M(object):
             def __init__(self, val):
                 self.val = val
             def signature(self, args):
@@ -384,7 +384,7 @@ class NodeTestCase(unittest.TestCase):
         else:
             self.fail("did not catch expected AttributeError")
 
-        class Builder:
+        class Builder(object):
             action = 'act'
             env = 'env1'
             overrides = {}
@@ -618,7 +618,7 @@ class NodeTestCase(unittest.TestCase):
 
         class testNode2(SCons.Node.Node):
             def __str__(self): return 'null_binfo'
-        class FS:
+        class FS(object):
             pass
         node = testNode2()
         node.fs = FS()
@@ -627,8 +627,8 @@ class NodeTestCase(unittest.TestCase):
         assert result is None, result
 
         def get_null_info():
-            class Null_SConsignEntry:
-                class Null_BuildInfo:
+            class Null_SConsignEntry(object):
+                class Null_BuildInfo(object):
                     def prepare_dependencies(self):
                         pass
                 binfo = Null_BuildInfo()
diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py
index 74a9c99..8b08c52 100644
--- a/src/engine/SCons/Node/PythonTests.py
+++ b/src/engine/SCons/Node/PythonTests.py
@@ -51,7 +51,7 @@ class ValueTestCase(unittest.TestCase):
     def test_build(self):
         """Test "building" a Value Node
         """
-        class fake_executor:
+        class fake_executor(object):
             def __call__(self, node):
                 node.write('faked')