summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Actions/actions.py2
-rw-r--r--test/Batch/SConstruct_changed_sources_alwaysBuild6
-rw-r--r--test/CPPPATH/expand-object.py2
-rw-r--r--test/CPPPATH/list-expansion.py2
-rw-r--r--test/Progress/object.py2
-rw-r--r--test/Scanner/generated.py2
-rw-r--r--test/ToolSurrogate.py4
-rw-r--r--test/Value.py2
8 files changed, 11 insertions, 11 deletions
diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index cf5890d..3bac188 100644
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -86,7 +86,7 @@ test.up_to_date(arguments = '.')
test.write('SConstruct', """
import subprocess
assert 'string' not in globals()
-class bld(object):
+class bld:
def __init__(self):
self.cmd = r'%(_python_)s build.py %%s 4 %%s'
def __call__(self, env, target, source):
diff --git a/test/Batch/SConstruct_changed_sources_alwaysBuild b/test/Batch/SConstruct_changed_sources_alwaysBuild
index c260316..dea7908 100644
--- a/test/Batch/SConstruct_changed_sources_alwaysBuild
+++ b/test/Batch/SConstruct_changed_sources_alwaysBuild
@@ -1,8 +1,8 @@
# Testcase for tigris bug 2622
-object = Object('changed_sources_main.cpp')
-AlwaysBuild(object)
+obj = Object('changed_sources_main.cpp')
+AlwaysBuild(obj)
-program = Program('test', source = [object])
+program = Program('test', source=[obj])
Default(program)
diff --git a/test/CPPPATH/expand-object.py b/test/CPPPATH/expand-object.py
index 8c811b7..54e1d39 100644
--- a/test/CPPPATH/expand-object.py
+++ b/test/CPPPATH/expand-object.py
@@ -34,7 +34,7 @@ import TestSCons
test = TestSCons.TestSCons()
test.write('SConstruct', """
-class XXX(object):
+class XXX:
def __init__(self, value):
self.value = value
def __str__(self):
diff --git a/test/CPPPATH/list-expansion.py b/test/CPPPATH/list-expansion.py
index cec333d..98817b9 100644
--- a/test/CPPPATH/list-expansion.py
+++ b/test/CPPPATH/list-expansion.py
@@ -42,7 +42,7 @@ test = TestSCons.TestSCons()
test.subdir('sub1', 'sub2', 'sub3', 'sub4')
test.write('SConstruct', """\
-class _inc_test(object):
+class _inc_test:
def __init__(self, name):
self.name = name
diff --git a/test/Progress/object.py b/test/Progress/object.py
index 2886d06..25c53cf 100644
--- a/test/Progress/object.py
+++ b/test/Progress/object.py
@@ -36,7 +36,7 @@ test.write('SConstruct', """\
import sys
env = Environment()
env['BUILDERS']['C'] = Builder(action=Copy('$TARGET', '$SOURCE'))
-class my_progress(object):
+class my_progress:
count = 0
def __call__(self, node, *args, **kw):
self.count = self.count + 1
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index f0fb0cc..f62bf9a 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -316,7 +316,7 @@ def write_out(fname, dict):
# because the .__*__() methods in new-style classes are not looked
# up on the instance, but resolve to the actual wrapped class methods,
# so we have to handle those directly.
-class CScannerCounter(object):
+class CScannerCounter:
def __init__(self, original_CScanner, *args, **kw):
self.original_CScanner = original_CScanner
def __eq__(self, *args, **kw):
diff --git a/test/ToolSurrogate.py b/test/ToolSurrogate.py
index 0674db1..a297056 100644
--- a/test/ToolSurrogate.py
+++ b/test/ToolSurrogate.py
@@ -34,7 +34,7 @@ import TestSCons
test = TestSCons.TestSCons()
test.write('SConstruct', """\
-class Curry(object):
+class Curry:
def __init__(self, fun, *args, **kwargs):
self.fun = fun
self.pending = args[:]
@@ -55,7 +55,7 @@ def Str(target, source, env, cmd=""):
result.append(" ".join(map(str, cmd)))
return '\\n'.join(result)
-class ToolSurrogate(object):
+class ToolSurrogate:
def __init__(self, tool, variable, func):
self.tool = tool
self.variable = variable
diff --git a/test/Value.py b/test/Value.py
index eb04eb0..7a702b0 100644
--- a/test/Value.py
+++ b/test/Value.py
@@ -37,7 +37,7 @@ python = TestSCons.python
SConstruct_content = """
Decider(r'%(source_signature)s')
-class Custom(object):
+class Custom:
def __init__(self, value): self.value = value
def __str__(self): return "C=" + str(self.value)