[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qmp: make qmp-shell work with python3
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH] qmp: make qmp-shell work with python3 |
Date: |
Tue, 18 Jun 2019 10:29:31 -0400 |
python3 doesn't have raw_input(), so qmp-shell breaks.
Use input() instead and override it with raw_input()
if running on python2.
Signed-off-by: Igor Mammedov <address@hidden>
---
scripts/qmp/qmp-shell | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 7776c7b141..8c49b39afa 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -308,7 +308,11 @@ class QMPShell(qmp.QEMUMonitorProtocol):
@return True if execution was ok, return False if disconnected.
"""
try:
- cmdline = raw_input(prompt)
+ try: # attempt to set Python2 override
+ import __builtin__;
+ getattr(__builtin__, 'raw_input', input)
+ except ModuleNotFoundError: pass
+ cmdline = input(prompt)
except EOFError:
print()
return False
--
2.18.1
- [Qemu-devel] [PATCH] qmp: make qmp-shell work with python3,
Igor Mammedov <=