mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python/qemu: qmp: Replace socket.error with OSError

Browse Source 
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>
Message-Id: <20191227134101.244496-2-wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Wainer dos Santos Moschetta 2019-12-27 10:40:57 -03:00 committed by Philippe Mathieu-Daudé
parent 863d2ed582
commit 10e163c039
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python/qemu/qmp.py
View File

@ -47,7 +47,7 @@ class QEMUMonitorProtocol(object):
or a tuple in the form ( address, port ) for a TCP or a tuple in the form ( address, port ) for a TCP
connection connection
@param server: server mode listens on the socket (bool) @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 @note No connection is established, this is done by the connect() or
accept() methods accept() methods
""" """
@ -107,8 +107,8 @@ class QEMUMonitorProtocol(object):
self.__sock.setblocking(0) self.__sock.setblocking(0)
try: try:
self.__json_read() self.__json_read()
except socket.error as err: except OSError as err:
if err[0] == errno.EAGAIN: if err.errno == errno.EAGAIN:
# No data available # No data available
pass pass
self.__sock.setblocking(1) self.__sock.setblocking(1)
@ -133,7 +133,7 @@ class QEMUMonitorProtocol(object):
Connect to the QMP Monitor and perform capabilities negotiation. Connect to the QMP Monitor and perform capabilities negotiation.
@return QMP greeting dict @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 QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities @raise QMPCapabilitiesError if fails to negotiate capabilities
""" """
@ -147,7 +147,7 @@ class QEMUMonitorProtocol(object):
Await connection from QMP Monitor and perform capabilities negotiation. Await connection from QMP Monitor and perform capabilities negotiation.
@return QMP greeting dict @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 QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities @raise QMPCapabilitiesError if fails to negotiate capabilities
""" """
@ -167,10 +167,10 @@ class QEMUMonitorProtocol(object):
self.logger.debug(">>> %s", qmp_cmd) self.logger.debug(">>> %s", qmp_cmd)
try: try:
self.__sock.sendall(json.dumps(qmp_cmd).encode('utf-8')) self.__sock.sendall(json.dumps(qmp_cmd).encode('utf-8'))
except socket.error as err: except OSError as err:
if err[0] == errno.EPIPE: if err.errno == errno.EPIPE:
return return
raise socket.error(err) raise err
resp = self.__json_read() resp = self.__json_read()
self.logger.debug("<<< %s", resp) self.logger.debug("<<< %s", resp)
return resp return resp