Commit 291928a8 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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 fec21036).

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-Id: <1450425164-24969-2-git-send-email-armbru@redhat.com>
parent e4a096b1

scripts/qapi.py

+4 −4
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class QAPISchemaParser(object): 
                    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 @@ class QAPISchema(object): 
            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