vert old-style classes in bin/* scripts to new-style classes.

9 files changed, 16 insertions, 16 deletions

diff --git a/bin/Command.py b/bin/Command.py
index 28fb110a..8702f51d 100644
--- a/bin/Command.py
+++ b/bin/Command.py
@@ -14,7 +14,7 @@ class Usage(Exception):
     def __init__(self, msg):
         self.msg = msg
 
-class CommandRunner:
+class CommandRunner(object):
     """
     Representation of a command to be executed.
     """
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index a82e8219..4927dc04 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -146,7 +146,7 @@ class Tool(Item):
 class ConstructionVariable(Item):
     pass
 
-class Chunk:
+class Chunk(object):
     def __init__(self, tag, body=None):
         self.tag = tag
         if not body:
@@ -158,7 +158,7 @@ class Chunk:
     def append(self, data):
         self.body.append(data)
 
-class Arguments:
+class Arguments(object):
     def __init__(self, signature, body=None):
         if not body:
             body = []
@@ -175,7 +175,7 @@ class Arguments:
     def append(self, data):
         self.body.append(data)
 
-class Summary:
+class Summary(object):
     def __init__(self):
         self.body = []
         self.collect = []
diff --git a/bin/caller-tree.py b/bin/caller-tree.py
index 85bb5998..03c1616a 100644
--- a/bin/caller-tree.py
+++ b/bin/caller-tree.py
@@ -42,7 +42,7 @@
 
 import sys
 
-class Entry:
+class Entry(object):
     def __init__(self, file_line_func):
         self.file_line_func = file_line_func
         self.called_by = []
diff --git a/bin/import-test.py b/bin/import-test.py
index 8ed5399d..65b6e791 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -35,7 +35,7 @@ directory = sys.argv[1]
 Top = None
 TopPath = None
 
-class Dir:
+class Dir(object):
     def __init__(self, path):
         self.path = path
         self.entries = {}
diff --git a/bin/scons-doc.py b/bin/scons-doc.py
index e5b29869..684ece3e 100644
--- a/bin/scons-doc.py
+++ b/bin/scons-doc.py
@@ -117,7 +117,7 @@ import TestCmd
 sgmllib.entityref = re.compile('&([a-zA-Z][-_.a-zA-Z0-9]*)[^-_a-zA-Z0-9]')
 
 # Classes for collecting different types of data we're interested in.
-class DataCollector:
+class DataCollector(object):
     """Generic class for collecting data between a start tag and end
     tag.  We subclass for various types of tags we care about."""
     def __init__(self):
@@ -215,7 +215,7 @@ def my_RDirs(self, pathlist, orig_RDirs=orig_RDirs):
     return [str(x).replace(os.sep, Sep) for x in orig_RDirs(self, pathlist)]
 SCons.Node.FS.File.RDirs = my_RDirs
 
-class Curry:
+class Curry(object):
     def __init__(self, fun, *args, **kwargs):
         self.fun = fun
         self.pending = args[:]
@@ -236,7 +236,7 @@ def Str(target, source, env, cmd=""):
         result.append(' '.join(map(str, cmd)))
     return '\\n'.join(result)
 
-class ToolSurrogate:
+class ToolSurrogate(object):
     def __init__(self, tool, variable, func, varlist):
         self.tool = tool
         if not isinstance(variable, list):
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index b8b12385..7cdb618a 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -131,7 +131,7 @@ Link_Entities_Header = """\
 -->
 """
 
-class SCons_XML:
+class SCons_XML(object):
     def __init__(self, entries, **kw):
         self.values = entries
         for k, v in kw.items():
@@ -271,7 +271,7 @@ class SCons_XML_to_man(SCons_XML):
         body = re.compile(r'\\f([BI])-', re.M).sub(r'\\f\1\-', body)
         f.write(body)
 
-class Proxy:
+class Proxy(object):
     def __init__(self, subject):
         """Wrap an object as a Proxy object"""
         self.__subject = subject
diff --git a/bin/sconsexamples.py b/bin/sconsexamples.py
index c2768c9b..6d3b2de5 100644
--- a/bin/sconsexamples.py
+++ b/bin/sconsexamples.py
@@ -91,7 +91,7 @@ import TestCmd
 # Override it with our own regular expression that adds underscore.
 sgmllib.entityref = re.compile('&([a-zA-Z][-_.a-zA-Z0-9]*)[^-_a-zA-Z0-9]')
 
-class DataCollector:
+class DataCollector(object):
     """Generic class for collecting data between a start tag and end
     tag.  We subclass for various types of tags we care about."""
     def __init__(self):
@@ -158,7 +158,7 @@ import SCons.Defaults
 
 platform = '%s'
 
-class Curry:
+class Curry(object):
     def __init__(self, fun, *args, **kwargs):
         self.fun = fun
         self.pending = args[:]
@@ -179,7 +179,7 @@ def Str(target, source, env, cmd=""):
         result.append(" ".join(map(str, cmd)))
     return '\\n'.join(result)
 
-class ToolSurrogate:
+class ToolSurrogate(object):
     def __init__(self, tool, variable, func):
         self.tool = tool
         self.variable = variable
diff --git a/bin/sfsum b/bin/sfsum
index aa4f2914..2dfa4224 100644
--- a/bin/sfsum
+++ b/bin/sfsum
@@ -41,7 +41,7 @@ SFName = {
     'Christoph Wiedemann'       : 'wiedeman',
 }
 
-class Artifact:
+class Artifact(object):
     """Just a place to hold attributes that we find in the XML."""
     pass
 
diff --git a/bin/time-scons.py b/bin/time-scons.py
index c1c8e8e8..c0095e8b 100644
--- a/bin/time-scons.py
+++ b/bin/time-scons.py
@@ -46,7 +46,7 @@ TimeSCons_revision = 4569
 TimeSCons_pieces = ['QMTest', 'timings', 'runtest.py']
 
 
-class CommandRunner:
+class CommandRunner(object):
     """
     Executor class for commands, including "commands" implemented by
     Python functions.