[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/46] python/qemu: qmp: Replace socket.error with OSError
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 01/46] python/qemu: qmp: Replace socket.error with OSError |
Date: |
Thu, 6 Feb 2020 22:18:51 +0100 |
From: Wainer dos Santos Moschetta <address@hidden>
The socket.error is deprecated from Python 3.3, instead it is
made a link to OSError. This change replaces the occurences
of socket.error with OSError.
Signed-off-by: Wainer dos Santos Moschetta <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
python/qemu/qmp.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 5c8cf6a056..8c6c9847d0 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -47,7 +47,7 @@ class QEMUMonitorProtocol(object):
or a tuple in the form ( address, port ) for a TCP
connection
@param server: server mode listens on the socket (bool)
- @raise socket.error on socket connection errors
+ @raise OSError on socket connection errors
@note No connection is established, this is done by the connect() or
accept() methods
"""
@@ -107,8 +107,8 @@ class QEMUMonitorProtocol(object):
self.__sock.setblocking(0)
try:
self.__json_read()
- except socket.error as err:
- if err[0] == errno.EAGAIN:
+ except OSError as err:
+ if err.errno == errno.EAGAIN:
# No data available
pass
self.__sock.setblocking(1)
@@ -133,7 +133,7 @@ class QEMUMonitorProtocol(object):
Connect to the QMP Monitor and perform capabilities negotiation.
@return QMP greeting dict
- @raise socket.error on socket connection errors
+ @raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
@@ -147,7 +147,7 @@ class QEMUMonitorProtocol(object):
Await connection from QMP Monitor and perform capabilities negotiation.
@return QMP greeting dict
- @raise socket.error on socket connection errors
+ @raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
@@ -167,10 +167,10 @@ class QEMUMonitorProtocol(object):
self.logger.debug(">>> %s", qmp_cmd)
try:
self.__sock.sendall(json.dumps(qmp_cmd).encode('utf-8'))
- except socket.error as err:
- if err[0] == errno.EPIPE:
+ except OSError as err:
+ if err.errno == errno.EPIPE:
return
- raise socket.error(err)
+ raise err
resp = self.__json_read()
self.logger.debug("<<< %s", resp)
return resp
--
2.21.1
- [PULL 00/46] Python queue 2020-02-06, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 01/46] python/qemu: qmp: Replace socket.error with OSError,
Philippe Mathieu-Daudé <=
- [PULL 02/46] python/qemu: Delint the qmp module, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 04/46] python/qemu: qmp: Make QEMUMonitorProtocol a context manager, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 05/46] python/qemu: qmp: Remove unnused attributes, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 06/46] python/qemu: accel: Fix kvm_available() on ppc64le, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 07/46] qemu-deprecated: Remove text about Python 2, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 08/46] python: Treat None-return of greeting cmd, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 09/46] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 10/46] Acceptance tests: Extract _console_interaction(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 11/46] Acceptance tests: Add interrupt_interactive_console_until_pattern(), Philippe Mathieu-Daudé, 2020/02/06