On 5/14/20 7:53 AM, John Snow wrote:
> 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
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>