From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,
Cleber Rosa <crosa@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [PATCH 01/20] python/qemu: use isort to lay out imports
Date: Tue, 6 Oct 2020 19:57:58 -0400 [thread overview]
Message-ID: <20201006235817.3280413-2-jsnow@redhat.com> (raw)
In-Reply-To: <20201006235817.3280413-1-jsnow@redhat.com>
Borrowed from the QAPI cleanup series, use the same configuration to
standardize the way we write and sort imports.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/.isort.cfg | 7 +++++++
python/qemu/accel.py | 1 +
python/qemu/console_socket.py | 2 +-
python/qemu/machine.py | 8 ++++----
python/qemu/qmp.py | 10 +++++-----
python/qemu/qtest.py | 2 +-
6 files changed, 19 insertions(+), 11 deletions(-)
create mode 100644 python/qemu/.isort.cfg
diff --git a/python/qemu/.isort.cfg b/python/qemu/.isort.cfg
new file mode 100644
index 00000000000..6d0fd6cc0d3
--- /dev/null
+++ b/python/qemu/.isort.cfg
@@ -0,0 +1,7 @@
+[settings]
+force_grid_wrap=4
+force_sort_within_sections=True
+include_trailing_comma=True
+line_length=72
+lines_after_imports=2
+multi_line_output=3
\ No newline at end of file
diff --git a/python/qemu/accel.py b/python/qemu/accel.py
index 7fabe629208..3ec6bdcfdb5 100644
--- a/python/qemu/accel.py
+++ b/python/qemu/accel.py
@@ -18,6 +18,7 @@
import os
import subprocess
+
LOG = logging.getLogger(__name__)
# Mapping host architecture to any additional architectures it can
diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py
index 70869fbbdc4..69f604c77fe 100644
--- a/python/qemu/console_socket.py
+++ b/python/qemu/console_socket.py
@@ -13,9 +13,9 @@
# the COPYING file in the top-level directory.
#
+from collections import deque
import socket
import threading
-from collections import deque
import time
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 82f3731fc3f..bc83f399c1b 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -20,15 +20,15 @@
import errno
import logging
import os
-import subprocess
import shutil
import signal
+import subprocess
import tempfile
-from typing import Optional, Type
from types import TracebackType
-from . import console_socket
+from typing import Optional, Type
+
+from . import console_socket, qmp
-from . import qmp
LOG = logging.getLogger(__name__)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 7935dababbf..ddf8347ac12 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -7,21 +7,21 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
-import json
import errno
-import socket
+import json
import logging
+import socket
+from types import TracebackType
from typing import (
Any,
- cast,
Dict,
Optional,
TextIO,
- Type,
Tuple,
+ Type,
Union,
+ cast,
)
-from types import TracebackType
# QMPMessage is a QMP Message of any kind.
diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py
index 888c8bd2f60..7700c0b09b6 100644
--- a/python/qemu/qtest.py
+++ b/python/qemu/qtest.py
@@ -17,8 +17,8 @@
# Based on qmp.py.
#
-import socket
import os
+import socket
from typing import Optional, TextIO
from .machine import QEMUMachine
--
2.26.2
next prev parent reply other threads:[~2020-10-07 0:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 23:57 [PATCH 00/20] python/qemu: strictly typed mypy conversion, pt2 John Snow
2020-10-06 23:57 ` John Snow [this message]
2020-10-07 4:53 ` [PATCH 01/20] python/qemu: use isort to lay out imports Philippe Mathieu-Daudé
2020-10-07 9:45 ` Kevin Wolf
2020-10-06 23:57 ` [PATCH 02/20] python/machine.py: Fix monitor address typing John Snow
2020-10-06 23:58 ` [PATCH 03/20] python/machine.py: reorder __init__ John Snow
2020-10-07 4:53 ` Philippe Mathieu-Daudé
2020-10-07 9:43 ` Kevin Wolf
2020-10-07 18:16 ` John Snow
2020-10-06 23:58 ` [PATCH 04/20] python/machine.py: Don't modify state in _base_args() John Snow
2020-10-06 23:58 ` [PATCH 05/20] python/machine.py: Handle None events in events_wait John Snow
2020-10-06 23:58 ` [PATCH 06/20] python/machine.py: use qmp.command John Snow
2020-10-07 4:54 ` Philippe Mathieu-Daudé
2020-10-06 23:58 ` [PATCH 07/20] python/machine.py: Add _qmp access shim John Snow
2020-10-07 9:53 ` Kevin Wolf
2020-10-07 18:21 ` John Snow
2020-10-06 23:58 ` [PATCH 08/20] python/machine.py: fix _popen access John Snow
2020-10-07 10:07 ` Kevin Wolf
2020-10-07 18:44 ` John Snow
2020-10-08 7:04 ` Kevin Wolf
2020-10-08 15:29 ` John Snow
2020-10-06 23:58 ` [PATCH 09/20] python/qemu: make 'args' style arguments immutable John Snow
2020-10-07 4:55 ` Philippe Mathieu-Daudé
2020-10-06 23:58 ` [PATCH 10/20] iotests.py: Adjust HMP kwargs typing John Snow
2020-10-06 23:58 ` [PATCH 11/20] python/qemu: Add mypy type annotations John Snow
2020-10-07 10:46 ` Kevin Wolf
2020-10-07 18:48 ` John Snow
2020-10-06 23:58 ` [PATCH 12/20] python/qemu/console_socket.py: Correct type of recv() John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-07 18:49 ` John Snow
2020-10-06 23:58 ` [PATCH 13/20] python/qemu/console_socket.py: fix typing of settimeout John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 14/20] python/qemu/console_socket.py: Clarify type of drain_thread John Snow
2020-10-07 10:59 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 15/20] python/qemu/console_socket.py: Add type hint annotations John Snow
2020-10-07 11:01 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 16/20] python/console_socket: avoid encoding to/from string John Snow
2020-10-07 11:10 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 17/20] python/qemu/qmp.py: Preserve error context on re-raise John Snow
2020-10-07 4:58 ` Philippe Mathieu-Daudé
2020-10-07 11:21 ` Kevin Wolf
2020-10-07 19:03 ` John Snow
2020-10-06 23:58 ` [PATCH 18/20] python/qemu/qmp.py: re-raise OSError when encountered John Snow
2020-10-07 4:59 ` Philippe Mathieu-Daudé
2020-10-07 11:30 ` Kevin Wolf
2020-10-07 19:17 ` John Snow
2020-10-08 23:41 ` John Snow
2020-10-06 23:58 ` [PATCH 19/20] python/qemu/qmp.py: Straighten out exception hierarchy John Snow
2020-10-07 12:53 ` Kevin Wolf
2020-10-06 23:58 ` [PATCH 20/20] python: add mypy config John Snow
2020-10-07 11:35 ` Kevin Wolf
2020-10-07 19:08 ` John Snow
2020-10-08 15:29 ` [PATCH 00/20] python/qemu: strictly typed mypy conversion, pt2 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=20201006235817.3280413-2-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).