Commit cf6c6345 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

scripts/qmp: 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-3-git-send-email-armbru@redhat.com>
parent 291928a8

scripts/qmp/qemu-ga-client

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ def main(address, cmd, args): 


    try:

        client = QemuGuestAgentClient(address)

    except QemuGuestAgent.error, e:

    except QemuGuestAgent.error as e:

        import errno



        print(e)

scripts/qmp/qmp

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ def main(args): 
        try:

            os.environ['QMP_PATH'] = path

            os.execvp(fullcmd, [fullcmd] + args)

        except OSError, (errno, msg):

            if errno == 2:

        except OSError as exc:

            if exc.errno == 2:

                print 'Command "%s" not found.' % (fullcmd)

                return 1

            raise

scripts/qmp/qmp-shell

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): 
    def _execute_cmd(self, cmdline):

        try:

            qmpcmd = self.__build_cmd(cmdline)

        except Exception, e:

        except Exception as e:

            print 'Error while parsing command line: %s' % e

            print 'command format: <command-name> ',

            print '[arg-name1=arg1] ... [arg-nameN=argN]'

scripts/qmp/qmp.py

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class QEMUMonitorProtocol: 
        self.__sock.setblocking(0)

        try:

            self.__json_read()

        except socket.error, err:

        except socket.error as err:

            if err[0] == errno.EAGAIN:

                # No data available

                pass
@@ -150,7 +150,7 @@ class QEMUMonitorProtocol: 
        """

        try:

            self.__sock.sendall(json.dumps(qmp_cmd))

        except socket.error, err:

        except socket.error as err:

            if err[0] == errno.EPIPE:

                return

            raise socket.error(err)