aboutsummaryrefslogtreecommitdiff
path: root/scripts/qmp/qmp.py
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-12-18 08:52:42 +0100
committerMarkus Armbruster <armbru@redhat.com>2016-02-08 17:29:54 +0100
commitcf6c63456b47118a7f0fbb917c220c0a483db6de (patch)
treec17387899208582087074bc5685b8328b76b5866 /scripts/qmp/qmp.py
parent291928a80f39670929fcce222acd5e21d1434692 (diff)
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 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>
Diffstat (limited to 'scripts/qmp/qmp.py')
-rw-r--r--scripts/qmp/qmp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 1d38e3e9e7..779332f321 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -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)