From 466551982b2eb54d2596f1d7230fe6f5102d35f8 Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Sat, 15 May 2010 14:55:40 +0000
Subject: Convert old-style classes in various Tool/*.py modules to new-style
 classes.

---
 src/engine/SCons/Tool/install.py | 2 +-
 src/engine/SCons/Tool/javac.py   | 2 +-
 src/engine/SCons/Tool/linkloc.py | 2 +-
 src/engine/SCons/Tool/qt.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/SCons/Tool/install.py b/src/engine/SCons/Tool/install.py
index dde0c98..f328248 100644
--- a/src/engine/SCons/Tool/install.py
+++ b/src/engine/SCons/Tool/install.py
@@ -108,7 +108,7 @@ def add_targets_to_INSTALLED_FILES(target, source, env):
     _UNIQUE_INSTALLED_FILES = None
     return (target, source)
 
-class DESTDIR_factory:
+class DESTDIR_factory(object):
     """ a node factory, where all files will be relative to the dir supplied
     in the constructor.
     """
diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py
index 3ebd4bc..fb6cc41 100644
--- a/src/engine/SCons/Tool/javac.py
+++ b/src/engine/SCons/Tool/javac.py
@@ -135,7 +135,7 @@ JavaBuilder = SCons.Builder.Builder(action = JavaAction,
                     target_factory = SCons.Node.FS.Entry,
                     source_factory = SCons.Node.FS.Entry)
 
-class pathopt:
+class pathopt(object):
     """
     Callable object for generating javac-style path options from
     a construction variable (e.g. -classpath, -sourcepath).
diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py
index 4ee0020..9c58561 100644
--- a/src/engine/SCons/Tool/linkloc.py
+++ b/src/engine/SCons/Tool/linkloc.py
@@ -61,7 +61,7 @@ def repl_linker_command(m):
         # to find it with recursive substitution
         return m.group(1) + '#' + m.group(2)
 
-class LinklocGenerator:
+class LinklocGenerator(object):
     def __init__(self, cmdline):
         self.cmdline = cmdline
 
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py
index 9cc3039..716c7d5 100644
--- a/src/engine/SCons/Tool/qt.py
+++ b/src/engine/SCons/Tool/qt.py
@@ -81,7 +81,7 @@ def find_file(filename, paths, node_factory):
             return node
     return None
 
-class _Automoc:
+class _Automoc(object):
     """
     Callable class, which works as an emitter for Programs, SharedLibraries and
     StaticLibraries.
-- 
cgit v0.12