jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

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>

Markus Armbruster 03e18810 86b227d9

+7 -7
+6 -6
tests/image-fuzzer/runner.py
··· 157 157 158 158 try: 159 159 os.makedirs(self.current_dir) 160 - except OSError, e: 160 + except OSError as e: 161 161 print >>sys.stderr, \ 162 162 "Error: The working directory '%s' cannot be used. Reason: %s"\ 163 163 % (self.work_dir, e[1]) ··· 244 244 temp_log = StringIO.StringIO() 245 245 try: 246 246 retcode = run_app(temp_log, current_cmd) 247 - except OSError, e: 247 + except OSError as e: 248 248 multilog("%sError: Start of '%s' failed. Reason: %s\n\n" 249 249 % (test_summary, os.path.basename(current_cmd[0]), 250 250 e[1]), ··· 356 356 opts, args = getopt.gnu_getopt(sys.argv[1:], 'c:hs:kvd:', 357 357 ['command=', 'help', 'seed=', 'config=', 358 358 'keep_passed', 'verbose', 'duration=']) 359 - except getopt.error, e: 359 + except getopt.error as e: 360 360 print >>sys.stderr, \ 361 361 "Error: %s\n\nTry 'runner.py --help' for more information" % e 362 362 sys.exit(1) ··· 374 374 elif opt in ('-c', '--command'): 375 375 try: 376 376 command = json.loads(arg) 377 - except (TypeError, ValueError, NameError), e: 377 + except (TypeError, ValueError, NameError) as e: 378 378 print >>sys.stderr, \ 379 379 "Error: JSON array of test commands cannot be loaded.\n" \ 380 380 "Reason: %s" % e ··· 390 390 elif opt == '--config': 391 391 try: 392 392 config = json.loads(arg) 393 - except (TypeError, ValueError, NameError), e: 393 + except (TypeError, ValueError, NameError) as e: 394 394 print >>sys.stderr, \ 395 395 "Error: JSON array with the fuzzer configuration cannot" \ 396 396 " be loaded\nReason: %s" % e ··· 414 414 415 415 try: 416 416 image_generator = __import__(generator_name) 417 - except ImportError, e: 417 + except ImportError as e: 418 418 print >>sys.stderr, \ 419 419 "Error: The image generator '%s' cannot be imported.\n" \ 420 420 "Reason: %s" % (generator_name, e)
+1 -1
tests/qemu-iotests/qed.py
··· 227 227 qed = QED(open(filename, 'r+b')) 228 228 try: 229 229 globals()[cmd](qed, *sys.argv[3:]) 230 - except TypeError, e: 230 + except TypeError as e: 231 231 sys.stderr.write(globals()[cmd].__doc__ + '\n') 232 232 sys.exit(1) 233 233