haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

scripts/qmp: Use Python 2.6 "except E as ..." syntax

Browse source 
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-3-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 08:52:42 +01:00
parent 291928a80f
commit cf6c63456b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/qmp/qemu-ga-client
View file

@ -259,7 +259,7 @@ def main(address, cmd, args):
try: try:
client = QemuGuestAgentClient(address) client = QemuGuestAgentClient(address)
except QemuGuestAgent.error, e: except QemuGuestAgent.error as e:
import errno import errno
print(e) print(e)

4
scripts/qmp/qmp
View file

@ -91,8 +91,8 @@ def main(args):
try: try:
os.environ['QMP_PATH'] = path os.environ['QMP_PATH'] = path
os.execvp(fullcmd, [fullcmd] + args) os.execvp(fullcmd, [fullcmd] + args)
except OSError, (errno, msg): except OSError as exc:
if errno == 2: if exc.errno == 2:
print 'Command "%s" not found.' % (fullcmd) print 'Command "%s" not found.' % (fullcmd)
return 1 return 1
raise raise

2
scripts/qmp/qmp-shell
View file

@ -240,7 +240,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _execute_cmd(self, cmdline): def _execute_cmd(self, cmdline):
try: try:
qmpcmd = self.__build_cmd(cmdline) qmpcmd = self.__build_cmd(cmdline)
except Exception, e: except Exception as e:
print 'Error while parsing command line: %s' % e print 'Error while parsing command line: %s' % e
print 'command format: <command-name> ', print 'command format: <command-name> ',
print '[arg-name1=arg1] ... [arg-nameN=argN]' print '[arg-name1=arg1] ... [arg-nameN=argN]'

4
scripts/qmp/qmp.py
View file

@ -92,7 +92,7 @@ class QEMUMonitorProtocol:
self.__sock.setblocking(0) self.__sock.setblocking(0)
try: try:
self.__json_read() self.__json_read()
except socket.error, err: except socket.error as err:
if err[0] == errno.EAGAIN: if err[0] == errno.EAGAIN:
# No data available # No data available
pass pass
@ -150,7 +150,7 @@ class QEMUMonitorProtocol:
""" """
try: try:
self.__sock.sendall(json.dumps(qmp_cmd)) self.__sock.sendall(json.dumps(qmp_cmd))
except socket.error, err: except socket.error as err:
if err[0] == errno.EPIPE: if err[0] == errno.EPIPE:
return return
raise socket.error(err) raise socket.error(err)