summaryrefslogtreecommitdiffstats
path: root/test/GetBuildFailures
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2012-12-19 19:41:31 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2012-12-19 19:41:31 (GMT)
commite7b9e30c3f5e4b80c4506bb0eb2fe5847c2ac2f8 (patch)
tree5b53542690a04881550fcfe095358d5ccc12602f /test/GetBuildFailures
parent30da57759fda031e95552e6b90fefa4252f90cad (diff)
downloadSCons-e7b9e30c3f5e4b80c4506bb0eb2fe5847c2ac2f8.zip
SCons-e7b9e30c3f5e4b80c4506bb0eb2fe5847c2ac2f8.tar.gz
SCons-e7b9e30c3f5e4b80c4506bb0eb2fe5847c2ac2f8.tar.bz2
Cleanup replacement of sys.exitfunc with atexit (Python 2+)
Diffstat (limited to 'test/GetBuildFailures')
-rw-r--r--test/GetBuildFailures/parallel.py9
-rw-r--r--test/GetBuildFailures/serial.py9
2 files changed, 4 insertions, 14 deletions
diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index e250486..b7576af 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -82,13 +82,8 @@ def print_build_failures():
for bf in sorted(GetBuildFailures(), key=lambda t: t.filename):
print "%%s failed: %%s" %% (bf.node, bf.errstr)
-try:
- import atexit
-except ImportError:
- import sys
- sys.exitfunc = print_build_failures
-else:
- atexit.register(print_build_failures)
+import atexit
+atexit.register(print_build_failures)
""" % locals())
test.write('f3.in', "f3.in\n")
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py
index 752b348..9c56bb1 100644
--- a/test/GetBuildFailures/serial.py
+++ b/test/GetBuildFailures/serial.py
@@ -95,13 +95,8 @@ def print_build_failures():
if bf.command:
print "BF: %%s" %% " ".join(Flatten(bf.command))
-try:
- import atexit
-except ImportError:
- import sys
- sys.exitfunc = print_build_failures
-else:
- atexit.register(print_build_failures)
+import atexit
+atexit.register(print_build_failures)
""" % locals())
test.write('f03.in', "f03.in\n")