mirror of https://gitee.com/openkylin/qemu.git
qapi: 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-2-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
e4a096b1cd
commit
291928a80f
|
@ -167,7 +167,7 @@ def __init__(self, fp, previously_included=[], incl_info=None):
|
|||
continue
|
||||
try:
|
||||
fobj = open(incl_abs_fname, 'r')
|
||||
except IOError, e:
|
||||
except IOError as e:
|
||||
raise QAPIExprError(expr_info,
|
||||
'%s: %s' % (e.strerror, include))
|
||||
exprs_include = QAPISchemaParser(fobj, previously_included,
|
||||
|
@ -1189,7 +1189,7 @@ def __init__(self, fname):
|
|||
self._predefining = False
|
||||
self._def_exprs()
|
||||
self.check()
|
||||
except (QAPISchemaError, QAPIExprError), err:
|
||||
except (QAPISchemaError, QAPIExprError) as err:
|
||||
print >>sys.stderr, err
|
||||
exit(1)
|
||||
|
||||
|
@ -1686,7 +1686,7 @@ def parse_command_line(extra_options="", extra_long_options=[]):
|
|||
"chp:o:" + extra_options,
|
||||
["source", "header", "prefix=",
|
||||
"output-dir="] + extra_long_options)
|
||||
except getopt.GetoptError, err:
|
||||
except getopt.GetoptError as err:
|
||||
print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err))
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -1740,7 +1740,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
|
|||
if output_dir:
|
||||
try:
|
||||
os.makedirs(output_dir)
|
||||
except os.error, e:
|
||||
except os.error as e:
|
||||
if e.errno != errno.EEXIST:
|
||||
raise
|
||||
|
||||
|
|
Loading…
Reference in New Issue