mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Use Python 2.6 "except E as ..." syntax

Browse Source 
PEP 8 calls for it, because it's forward compatible with Python 3.
Supported since Python 2.6, which we require (commit fec2103).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <1450425164-24969-5-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 08:52:44 +01:00
parent 86b227d984
commit 03e188102c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/image-fuzzer/runner.py
View File

@ -157,7 +157,7 @@ class TestEnv(object):
try: try:
os.makedirs(self.current_dir) os.makedirs(self.current_dir)
except OSError, e: except OSError as e:
print >>sys.stderr, \ print >>sys.stderr, \
"Error: The working directory '%s' cannot be used. Reason: %s"\ "Error: The working directory '%s' cannot be used. Reason: %s"\
% (self.work_dir, e[1]) % (self.work_dir, e[1])
@ -244,7 +244,7 @@ class TestEnv(object):
temp_log = StringIO.StringIO() temp_log = StringIO.StringIO()
try: try:
retcode = run_app(temp_log, current_cmd) retcode = run_app(temp_log, current_cmd)
except OSError, e: except OSError as e:
multilog("%sError: Start of '%s' failed. Reason: %s\n\n" multilog("%sError: Start of '%s' failed. Reason: %s\n\n"
% (test_summary, os.path.basename(current_cmd[0]), % (test_summary, os.path.basename(current_cmd[0]),
e[1]), e[1]),
@ -356,7 +356,7 @@ if __name__ == '__main__':
opts, args = getopt.gnu_getopt(sys.argv[1:], 'c:hs:kvd:', opts, args = getopt.gnu_getopt(sys.argv[1:], 'c:hs:kvd:',
['command=', 'help', 'seed=', 'config=', ['command=', 'help', 'seed=', 'config=',
'keep_passed', 'verbose', 'duration=']) 'keep_passed', 'verbose', 'duration='])
except getopt.error, e: except getopt.error as e:
print >>sys.stderr, \ print >>sys.stderr, \
"Error: %s\n\nTry 'runner.py --help' for more information" % e "Error: %s\n\nTry 'runner.py --help' for more information" % e
sys.exit(1) sys.exit(1)
@ -374,7 +374,7 @@ if __name__ == '__main__':
elif opt in ('-c', '--command'): elif opt in ('-c', '--command'):
try: try:
command = json.loads(arg) command = json.loads(arg)
except (TypeError, ValueError, NameError), e: except (TypeError, ValueError, NameError) as e:
print >>sys.stderr, \ print >>sys.stderr, \
"Error: JSON array of test commands cannot be loaded.\n" \ "Error: JSON array of test commands cannot be loaded.\n" \
"Reason: %s" % e "Reason: %s" % e
@ -390,7 +390,7 @@ if __name__ == '__main__':
elif opt == '--config': elif opt == '--config':
try: try:
config = json.loads(arg) config = json.loads(arg)
except (TypeError, ValueError, NameError), e: except (TypeError, ValueError, NameError) as e:
print >>sys.stderr, \ print >>sys.stderr, \
"Error: JSON array with the fuzzer configuration cannot" \ "Error: JSON array with the fuzzer configuration cannot" \
" be loaded\nReason: %s" % e " be loaded\nReason: %s" % e
@ -414,7 +414,7 @@ if __name__ == '__main__':
try: try:
image_generator = __import__(generator_name) image_generator = __import__(generator_name)
except ImportError, e: except ImportError as e:
print >>sys.stderr, \ print >>sys.stderr, \
"Error: The image generator '%s' cannot be imported.\n" \ "Error: The image generator '%s' cannot be imported.\n" \
"Reason: %s" % (generator_name, e) "Reason: %s" % (generator_name, e)

2
tests/qemu-iotests/qed.py
View File

@ -227,7 +227,7 @@ def main():
qed = QED(open(filename, 'r+b')) qed = QED(open(filename, 'r+b'))
try: try:
globals()[cmd](qed, *sys.argv[3:]) globals()[cmd](qed, *sys.argv[3:])
except TypeError, e: except TypeError as e:
sys.stderr.write(globals()[cmd].__doc__ + '\n') sys.stderr.write(globals()[cmd].__doc__ + '\n')
sys.exit(1) sys.exit(1)