ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Markus Armbruster 2015-12-18 08:52:41 +01:00
parent e4a096b1cd
commit 291928a80f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/qapi.py
View File

@ -167,7 +167,7 @@ class QAPISchemaParser(object):
continue continue
try: try:
fobj = open(incl_abs_fname, 'r') fobj = open(incl_abs_fname, 'r')
except IOError, e: except IOError as e:
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
'%s: %s' % (e.strerror, include)) '%s: %s' % (e.strerror, include))
exprs_include = QAPISchemaParser(fobj, previously_included, exprs_include = QAPISchemaParser(fobj, previously_included,
@ -1189,7 +1189,7 @@ class QAPISchema(object):
self._predefining = False self._predefining = False
self._def_exprs() self._def_exprs()
self.check() self.check()
except (QAPISchemaError, QAPIExprError), err: except (QAPISchemaError, QAPIExprError) as err:
print >>sys.stderr, err print >>sys.stderr, err
exit(1) exit(1)
@ -1686,7 +1686,7 @@ def parse_command_line(extra_options="", extra_long_options=[]):
"chp:o:" + extra_options, "chp:o:" + extra_options,
["source", "header", "prefix=", ["source", "header", "prefix=",
"output-dir="] + extra_long_options) "output-dir="] + extra_long_options)
except getopt.GetoptError, err: except getopt.GetoptError as err:
print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err)) print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err))
sys.exit(1) sys.exit(1)
@ -1740,7 +1740,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
if output_dir: if output_dir:
try: try:
os.makedirs(output_dir) os.makedirs(output_dir)
except os.error, e: except os.error as e:
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
raise raise