| Message ID | 20191227134101.244496-2-wainersm@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | python/qemu: qmp: Fix, delint and improvements | expand |
On 12/27/19 8:40 AM, Wainer dos Santos Moschetta wrote: > 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 <wainersm@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> (Are there other clients that of this code that would still be using the old exception?) > --- > 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 >
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
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 <wainersm@redhat.com> --- python/qemu/qmp.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)