From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Max Reitz" <mreitz@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH RFC 05/32] python/qemu/lib: delint; add flake8 config
Date: Thu, 14 May 2020 01:53:36 -0400 [thread overview]
Message-ID: <20200514055403.18902-6-jsnow@redhat.com> (raw)
In-Reply-To: <20200514055403.18902-1-jsnow@redhat.com>
Mostly, ignore the "no bare except" rule, because flake8 is not
contextual and cannot determine if we re-raise. Pylint can, though, so
always prefer pylint for that.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/lib/.flake8 | 2 ++
python/qemu/lib/accel.py | 9 ++++++---
python/qemu/lib/machine.py | 13 +++++++++----
python/qemu/lib/qmp.py | 4 ++--
4 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644 python/qemu/lib/.flake8
diff --git a/python/qemu/lib/.flake8 b/python/qemu/lib/.flake8
new file mode 100644
index 0000000000..45d8146f3f
--- /dev/null
+++ b/python/qemu/lib/.flake8
@@ -0,0 +1,2 @@
+[flake8]
+extend-ignore = E722 # Pylint handles this, but smarter.
\ No newline at end of file
diff --git a/python/qemu/lib/accel.py b/python/qemu/lib/accel.py
index 36ae85791e..7fabe62920 100644
--- a/python/qemu/lib/accel.py
+++ b/python/qemu/lib/accel.py
@@ -23,11 +23,12 @@
# Mapping host architecture to any additional architectures it can
# support which often includes its 32 bit cousin.
ADDITIONAL_ARCHES = {
- "x86_64" : "i386",
- "aarch64" : "armhf",
- "ppc64le" : "ppc64",
+ "x86_64": "i386",
+ "aarch64": "armhf",
+ "ppc64le": "ppc64",
}
+
def list_accel(qemu_bin):
"""
List accelerators enabled in the QEMU binary.
@@ -47,6 +48,7 @@ def list_accel(qemu_bin):
# Skip the first line which is the header.
return [acc.strip() for acc in out.splitlines()[1:]]
+
def kvm_available(target_arch=None, qemu_bin=None):
"""
Check if KVM is available using the following heuristic:
@@ -69,6 +71,7 @@ def kvm_available(target_arch=None, qemu_bin=None):
return False
return True
+
def tcg_available(qemu_bin):
"""
Check if TCG is available.
diff --git a/python/qemu/lib/machine.py b/python/qemu/lib/machine.py
index c79fc8fb89..4b260fa2cb 100644
--- a/python/qemu/lib/machine.py
+++ b/python/qemu/lib/machine.py
@@ -29,6 +29,7 @@
LOG = logging.getLogger(__name__)
+
class QEMUMachineError(Exception):
"""
Exception called when an error in QEMUMachine happens.
@@ -62,7 +63,8 @@ class QEMUMachine:
"""
A QEMU VM
- Use this object as a context manager to ensure the QEMU process terminates::
+ Use this object as a context manager to ensure
+ the QEMU process terminates::
with VM(binary) as vm:
...
@@ -188,8 +190,10 @@ def send_fd_scm(self, fd=None, file_path=None):
fd_param.append(str(fd))
devnull = open(os.path.devnull, 'rb')
- proc = subprocess.Popen(fd_param, stdin=devnull, stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT, close_fds=False)
+ proc = subprocess.Popen(
+ fd_param, stdin=devnull, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, close_fds=False
+ )
output = proc.communicate()[0]
if output:
LOG.debug(output)
@@ -491,7 +495,8 @@ def event_wait(self, name, timeout=60.0, match=None):
def events_wait(self, events, timeout=60.0):
"""
- events_wait waits for and returns a named event from QMP with a timeout.
+ events_wait waits for and returns a named event
+ from QMP with a timeout.
events: a sequence of (name, match_criteria) tuples.
The match criteria are optional and may be None.
diff --git a/python/qemu/lib/qmp.py b/python/qemu/lib/qmp.py
index d6c9b2f4b1..6ae7693965 100644
--- a/python/qemu/lib/qmp.py
+++ b/python/qemu/lib/qmp.py
@@ -168,8 +168,8 @@ def accept(self, timeout=15.0):
@param timeout: timeout in seconds (nonnegative float number, or
None). The value passed will set the behavior of the
- underneath QMP socket as described in [1]. Default value
- is set to 15.0.
+ underneath QMP socket as described in [1].
+ Default value is set to 15.0.
@return QMP greeting dict
@raise OSError on socket connection errors
@raise QMPConnectError if the greeting is not received
--
2.21.1
next prev parent reply other threads:[~2020-05-14 5:58 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 5:53 [PATCH RFC 00/32] python/qemu: refactor as installable package John Snow
2020-05-14 5:53 ` [PATCH RFC 01/32] python/qemu: create qemu.lib module John Snow
2020-05-18 18:14 ` Vladimir Sementsov-Ogievskiy
2020-05-18 18:23 ` John Snow
2020-05-18 19:33 ` Vladimir Sementsov-Ogievskiy
2020-05-19 0:27 ` John Snow
2020-05-19 10:54 ` Vladimir Sementsov-Ogievskiy
2020-05-26 15:07 ` Philippe Mathieu-Daudé
2020-06-02 11:15 ` Vladimir Sementsov-Ogievskiy
2020-05-26 15:22 ` Daniel P. Berrangé
2020-05-26 15:23 ` Philippe Mathieu-Daudé
2020-05-26 15:25 ` Daniel P. Berrangé
2020-05-27 14:28 ` John Snow
2020-05-27 14:31 ` Daniel P. Berrangé
2020-06-02 10:08 ` Kevin Wolf
2020-06-02 16:44 ` John Snow
2020-06-03 9:00 ` Kevin Wolf
2020-06-03 14:09 ` John Snow
2020-05-14 5:53 ` [PATCH RFC 02/32] scripts/qmp: Fix shebang and imports John Snow
2020-05-26 15:55 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 03/32] python//machine.py: remove bare except John Snow
2020-05-14 13:55 ` Eric Blake
2020-05-14 14:26 ` John Snow
2020-05-26 15:08 ` Philippe Mathieu-Daudé
2020-05-26 15:09 ` Philippe Mathieu-Daudé
2020-06-02 11:01 ` Kevin Wolf
2020-06-02 16:47 ` John Snow
2020-05-14 5:53 ` [PATCH RFC 04/32] python/qemu/lib: delint, add pylintrc John Snow
2020-05-26 15:57 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` John Snow [this message]
2020-05-26 15:58 ` [PATCH RFC 05/32] python/qemu/lib: delint; add flake8 config Philippe Mathieu-Daudé
2020-05-31 9:57 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 06/32] python/qemu: formalize as package John Snow
2020-05-26 16:00 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 07/32] python/qemu: add README.rst John Snow
2020-05-14 5:53 ` [PATCH RFC 08/32] python/qemu: Add Pipfile John Snow
2020-05-14 5:53 ` [PATCH RFC 09/32] python/qemu: add pylint to Pipfile John Snow
2020-05-14 5:53 ` [PATCH RFC 10/32] python/qemu: Add flake8 " John Snow
2020-05-14 5:53 ` [PATCH RFC 11/32] python/qemu/lib: remove Python2 style super() calls John Snow
2020-05-14 6:01 ` Philippe Mathieu-Daudé
2020-05-31 9:58 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 12/32] python/qemu/lib: fix socket.makefile() typing John Snow
2020-05-31 9:59 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 13/32] python/qemu/lib: Adjust traceback typing John Snow
2020-05-26 16:01 ` Philippe Mathieu-Daudé
2020-05-31 10:01 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 14/32] python//qmp.py: use True/False for non/blocking modes John Snow
2020-05-14 6:02 ` Philippe Mathieu-Daudé
2020-05-31 10:01 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 15/32] python//qmp.py: Define common types John Snow
2020-05-14 5:53 ` [PATCH RFC 16/32] python//qmp.py: re-absorb MonitorResponseError John Snow
2020-05-14 6:03 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 17/32] python//qmp.py: Do not return None from cmd_obj John Snow
2020-05-14 5:53 ` [PATCH RFC 18/32] python//qmp.py: add casts to JSON deserialization John Snow
2020-05-26 16:03 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 19/32] python//qmp.py: add QMPProtocolError John Snow
2020-05-14 6:05 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 20/32] python//qmp.py: assert sockfile is not None John Snow
2020-05-26 16:03 ` Philippe Mathieu-Daudé
2020-05-26 16:05 ` Philippe Mathieu-Daudé
2020-05-31 10:02 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 21/32] python//machine.py: remove logging configuration John Snow
2020-05-14 6:06 ` Philippe Mathieu-Daudé
2020-05-31 10:03 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 22/32] python//machine.py: Fix monitor address typing John Snow
2020-05-14 5:53 ` [PATCH RFC 23/32] python//machine.py: reorder __init__ John Snow
2020-05-14 6:08 ` Philippe Mathieu-Daudé
2020-05-14 5:53 ` [PATCH RFC 24/32] python//machine.py: Don't modify state in _base_args() John Snow
2020-05-14 5:53 ` [PATCH RFC 25/32] python//machine.py: Handle None events in event_wait John Snow
2020-05-14 5:53 ` [PATCH RFC 26/32] python//machine.py: use qmp.command John Snow
2020-05-29 0:18 ` John Snow
2020-06-02 10:18 ` Kevin Wolf
2020-06-02 10:26 ` Kevin Wolf
2020-06-02 20:11 ` John Snow
2020-05-14 5:53 ` [PATCH RFC 27/32] python//machine.py: Add _qmp access shim John Snow
2020-05-14 5:53 ` [PATCH RFC 28/32] python//machine.py: fix _popen access John Snow
2020-05-14 5:54 ` [PATCH RFC 29/32] python//qtest.py: Check before accessing _qtest John Snow
2020-05-14 6:13 ` Philippe Mathieu-Daudé
2020-05-31 10:04 ` Philippe Mathieu-Daudé
2020-05-14 5:54 ` [PATCH RFC 30/32] python/qemu/lib: make 'args' style arguments immutable John Snow
2020-05-14 5:54 ` [PATCH RFC 31/32] python/qemu: add mypy to Pipfile John Snow
2020-05-14 5:54 ` [PATCH RFC 32/32] python/qemu/lib: Add mypy type annotations John Snow
2020-05-18 12:41 ` [PATCH RFC 00/32] python/qemu: refactor as installable package Philippe Mathieu-Daudé
2020-05-18 14:15 ` John Snow
2020-05-21 18:48 ` John Snow
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=20200514055403.18902-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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).