summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-05-16 04:58:24 (GMT)
committerSteven Knight <knight@baldmt.com>2010-05-16 04:58:24 (GMT)
commit85b27cd78d103a0514c5b57f69785c01a66a4dd7 (patch)
treee9799bb7f7e32c4235ed039294ffbb34644b5b99 /src/engine
parent466551982b2eb54d2596f1d7230fe6f5102d35f8 (diff)
downloadSCons-85b27cd78d103a0514c5b57f69785c01a66a4dd7.zip
SCons-85b27cd78d103a0514c5b57f69785c01a66a4dd7.tar.gz
SCons-85b27cd78d103a0514c5b57f69785c01a66a4dd7.tar.bz2
Convert old-style classes in compat/*.py modules to new-style classes.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/compat/_scons_builtins.py2
-rw-r--r--src/engine/SCons/compat/_scons_hashlib.py2
-rw-r--r--src/engine/SCons/compat/_scons_subprocess.py11
3 files changed, 4 insertions, 11 deletions
diff --git a/src/engine/SCons/compat/_scons_builtins.py b/src/engine/SCons/compat/_scons_builtins.py
index fcf0769..3c8a0e5 100644
--- a/src/engine/SCons/compat/_scons_builtins.py
+++ b/src/engine/SCons/compat/_scons_builtins.py
@@ -90,7 +90,7 @@ try:
memoryview
except NameError:
# Pre-2.7 doesn't have the memoryview() built-in.
- class memoryview:
+ class memoryview(object):
def __init__(self, obj):
# wrapping buffer in () keeps the fixer from changing it
self.obj = (buffer)(obj)
diff --git a/src/engine/SCons/compat/_scons_hashlib.py b/src/engine/SCons/compat/_scons_hashlib.py
index 15cb9e3..04d31fa 100644
--- a/src/engine/SCons/compat/_scons_hashlib.py
+++ b/src/engine/SCons/compat/_scons_hashlib.py
@@ -36,7 +36,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import md5
from string import hexdigits
-class md5obj:
+class md5obj(object):
md5_module = md5
diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py
index 2106636..eebe53d 100644
--- a/src/engine/SCons/compat/_scons_subprocess.py
+++ b/src/engine/SCons/compat/_scons_subprocess.py
@@ -383,13 +383,13 @@ if mswindows:
try:
# Try to get _subprocess
from _subprocess import *
- class STARTUPINFO:
+ class STARTUPINFO(object):
dwFlags = 0
hStdInput = None
hStdOutput = None
hStdError = None
wShowWindow = 0
- class pywintypes:
+ class pywintypes(object):
error = IOError
except ImportError:
# If not there, then drop back to requiring pywin32
@@ -569,13 +569,6 @@ def list2cmdline(seq):
return ''.join(result)
-
-try:
- object
-except NameError:
- class object:
- pass
-
class Popen(object):
def __init__(self, args, bufsize=0, executable=None,
stdin=None, stdout=None, stderr=None,