42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From 81ab64fe4c328b3981290afe4860f9bcd8f8750c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 26 Sep 2024 16:07:19 +0800
|
||
|
|
Subject: [PATCH] python/aqmp: use absolute import statement
|
||
|
|
|
||
|
|
cherry picked from commit f75b20e4f16663af4c65657821c5727b1d1c2493
|
||
|
|
|
||
|
|
pylint's dependency astroid appears to have bugs in 2.9.1 and 2.9.2 (Dec
|
||
|
|
31 and Jan 3) that appear to erroneously expect the qemu namespace to
|
||
|
|
have an __init__.py file. astroid 2.9.3 (Jan 9) avoids that problem, but
|
||
|
|
appears to not understand a relative import within a namespace package.
|
||
|
|
|
||
|
|
Update the relative import - it was worth changing anyway, because these
|
||
|
|
packages will eventually be packaged and distributed separately.
|
||
|
|
|
||
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
||
|
|
Reviewed-by: Beraldo Leal <bleal@redhat.com>
|
||
|
|
Message-id: 20220110191349.1841027-2-jsnow@redhat.com
|
||
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
python/qemu/aqmp/aqmp_tui.py | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/python/qemu/aqmp/aqmp_tui.py b/python/qemu/aqmp/aqmp_tui.py
|
||
|
|
index a2929f771c..f1e926dd75 100644
|
||
|
|
--- a/python/qemu/aqmp/aqmp_tui.py
|
||
|
|
+++ b/python/qemu/aqmp/aqmp_tui.py
|
||
|
|
@@ -35,7 +35,8 @@
|
||
|
|
import urwid
|
||
|
|
import urwid_readline
|
||
|
|
|
||
|
|
-from ..qmp import QEMUMonitorProtocol, QMPBadPortError
|
||
|
|
+from qemu.qmp import QEMUMonitorProtocol, QMPBadPortError
|
||
|
|
+
|
||
|
|
from .error import ProtocolError
|
||
|
|
from .message import DeserializationError, Message, UnexpectedTypeError
|
||
|
|
from .protocol import ConnectError, Runstate
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|