From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>
Subject: [PULL 02/46] python/qemu: Delint the qmp module
Date: Thu, 6 Feb 2020 22:18:52 +0100 [thread overview]
Message-ID: <20200206211936.17098-3-philmd@redhat.com> (raw)
In-Reply-To: <20200206211936.17098-1-philmd@redhat.com>
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
This clean up the pylint-3 report on qmp:
************* Module qemu.qmp
python/qemu/qmp.py:1:0: C0111: Missing module docstring (missing-docstring)
python/qemu/qmp.py:17:0: C0111: Missing class docstring (missing-docstring)
python/qemu/qmp.py:21:0: C0111: Missing class docstring (missing-docstring)
python/qemu/qmp.py:25:0: C0111: Missing class docstring (missing-docstring)
python/qemu/qmp.py:29:0: C0111: Missing class docstring (missing-docstring)
python/qemu/qmp.py:33:0: C0111: Missing class docstring (missing-docstring)
python/qemu/qmp.py:33:0: R0205: Class 'QEMUMonitorProtocol' inherits from object, can be safely removed from bases in python3 (useless-object-inheritance)
python/qemu/qmp.py:80:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
python/qemu/qmp.py:131:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
python/qemu/qmp.py:159:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
python/qemu/qmp.py:245:4: C0111: Missing method docstring (missing-docstring)
python/qemu/qmp.py:249:4: C0111: Missing method docstring (missing-docstring)
python/qemu/qmp.py:252:4: C0111: Missing method docstring (missing-docstring)
python/qemu/qmp.py:255:4: C0111: Missing method docstring (missing-docstring)
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191227134101.244496-3-wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
python/qemu/qmp.py | 51 +++++++++++++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 10 deletions(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 8c6c9847d0..f4e04a6683 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -1,5 +1,4 @@
-# QEMU Monitor Protocol Python class
-#
+""" QEMU Monitor Protocol Python class """
# Copyright (C) 2009, 2010 Red Hat Inc.
#
# Authors:
@@ -15,22 +14,34 @@ import logging
class QMPError(Exception):
- pass
+ """
+ QMP base exception
+ """
class QMPConnectError(QMPError):
- pass
+ """
+ QMP connection exception
+ """
class QMPCapabilitiesError(QMPError):
- pass
+ """
+ QMP negotiate capabilities exception
+ """
class QMPTimeoutError(QMPError):
- pass
+ """
+ QMP timeout exception
+ """
-class QEMUMonitorProtocol(object):
+class QEMUMonitorProtocol:
+ """
+ Provide an API to connect to QEMU via QEMU Monitor Protocol (QMP) and then
+ allow to handle commands and events.
+ """
#: Logger object for debugging messages
logger = logging.getLogger('QMP')
@@ -81,7 +92,7 @@ class QEMUMonitorProtocol(object):
while True:
data = self.__sockfile.readline()
if not data:
- return
+ return None
resp = json.loads(data)
if 'event' in resp:
self.logger.debug("<<< %s", resp)
@@ -132,7 +143,7 @@ class QEMUMonitorProtocol(object):
"""
Connect to the QMP Monitor and perform capabilities negotiation.
- @return QMP greeting dict
+ @return QMP greeting dict, or None if negotiate is false
@raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
@@ -141,6 +152,7 @@ class QEMUMonitorProtocol(object):
self.__sockfile = self.__sock.makefile()
if negotiate:
return self.__negotiate_capabilities()
+ return None
def accept(self):
"""
@@ -169,7 +181,7 @@ class QEMUMonitorProtocol(object):
self.__sock.sendall(json.dumps(qmp_cmd).encode('utf-8'))
except OSError as err:
if err.errno == errno.EPIPE:
- return
+ return None
raise err
resp = self.__json_read()
self.logger.debug("<<< %s", resp)
@@ -243,14 +255,33 @@ class QEMUMonitorProtocol(object):
self.__events = []
def close(self):
+ """
+ Close the socket and socket file.
+ """
self.__sock.close()
self.__sockfile.close()
def settimeout(self, timeout):
+ """
+ Set the socket timeout.
+
+ @param timeout (float): timeout in seconds, or None.
+ @note This is a wrap around socket.settimeout
+ """
self.__sock.settimeout(timeout)
def get_sock_fd(self):
+ """
+ Get the socket file descriptor.
+
+ @return The file descriptor number.
+ """
return self.__sock.fileno()
def is_scm_available(self):
+ """
+ Check if the socket allows for SCM_RIGHTS.
+
+ @return True if SCM_RIGHTS is available, otherwise False.
+ """
return self.__sock.family == socket.AF_UNIX
--
2.21.1
next prev parent reply other threads:[~2020-02-06 21:21 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 21:18 [PULL 00/46] Python queue 2020-02-06 Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 01/46] python/qemu: qmp: Replace socket.error with OSError Philippe Mathieu-Daudé
2020-02-06 21:18 ` Philippe Mathieu-Daudé [this message]
2020-02-06 21:18 ` [PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 04/46] python/qemu: qmp: Make QEMUMonitorProtocol a context manager Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 05/46] python/qemu: qmp: Remove unnused attributes Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 06/46] python/qemu: accel: Fix kvm_available() on ppc64le Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 07/46] qemu-deprecated: Remove text about Python 2 Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 08/46] python: Treat None-return of greeting cmd Philippe Mathieu-Daudé
2020-02-06 21:18 ` [PULL 09/46] python/qemu/machine: Allow to use other serial consoles than default Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 10/46] Acceptance tests: Extract _console_interaction() Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 11/46] Acceptance tests: Add interrupt_interactive_console_until_pattern() Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 12/46] travis.yml: install rpm2cpio for acceptance tests Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 13/46] tests/boot_linux_console: add extract_from_rpm method Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 14/46] tests/boot_linux_console: use os.path for filesystem paths Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 15/46] tests/boot_linux_console: fix extract_from_deb() comment Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 16/46] tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot' Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 17/46] tests/acceptance: Add boot tests for some of the QEMU advent calendar images Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 18/46] tests: rename virtio_seg_max_adjust to virtio_check_params Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 19/46] tests/acceptance/virtio_check_params: Improve exception logging Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 20/46] tests/acceptance/virtio_check_params: List machine being tested Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 21/46] tests/acceptance/virtio_check_params: Default to -nodefaults Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 22/46] tests/acceptance/virtio_check_params: Disable the test Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 23/46] tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 24/46] tests/acceptance/version: Default to -nodefaults Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 25/46] tests/acceptance/migration: Factor out assert_migration() Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 26/46] tests/acceptance/migration: Factor out do_migrate() Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 27/46] tests/acceptance/migration: Test UNIX transport when migrating Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 28/46] tests/acceptance/migration: Test EXEC " Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 29/46] tests/acceptance/migration: Add the 'migration' tag Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 30/46] tests/acceptance/migration: Default to -nodefaults Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 31/46] scripts/checkpatch.pl: Only allow Python 3 interpreter Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 32/46] tests/qemu-iotests/check: Allow use of python3 interpreter Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 33/46] tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__) Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 34/46] tests: Explicit usage of Python 3 Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 35/46] scripts: Explicit usage of Python 3 (scripts with __main__) Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 36/46] scripts/minikconf: Explicit usage of Python 3 Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 37/46] scripts/tracetool: Remove shebang header Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 38/46] tests/acceptance: " Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 39/46] tests/vm: " Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 40/46] tests/qemu-iotests: Explicit usage of Python3 (scripts without __main__) Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 41/46] scripts: Explicit usage of Python 3 " Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 42/46] tests/qemu-iotests/check: Only check for Python 3 interpreter Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 43/46] scripts/signrom: remove Python 2 support, add shebang Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 44/46] make all Python scripts executable Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 45/46] drop "from __future__ import print_function" Philippe Mathieu-Daudé
2020-02-06 21:19 ` [PULL 46/46] .readthedocs.yml: specify some minimum python requirements Philippe Mathieu-Daudé
2020-02-06 22:07 ` [PULL 00/46] Python queue 2020-02-06 Eduardo Habkost
2020-02-07 11:51 ` Peter Maydell
2020-02-07 12:39 ` Philippe Mathieu-Daudé
2020-02-07 14:01 ` Philippe Mathieu-Daudé
2020-02-07 13:30 ` Philippe Mathieu-Daudé
2020-02-07 13:34 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200206211936.17098-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).