| Message ID | 20190620154035.30989-1-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] qmp: make qmp-shell work with python3 | expand |
On Thu, Jun 20, 2019 at 11:40:35AM -0400, Igor Mammedov wrote: > 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 <imammedo@redhat.com> Queued, thanks.
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 7776c7b141..f1cddeafbc 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -78,6 +78,9 @@ import re sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu import qmp +if sys.version_info[0] == 2: + input = raw_input + class QMPCompleter(list): def complete(self, text, state): for cmd in self: @@ -308,7 +311,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): @return True if execution was ok, return False if disconnected. """ try: - cmdline = raw_input(prompt) + cmdline = input(prompt) except EOFError: print() return False
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 <imammedo@redhat.com> --- v2: use sys.version_info[0] instead try/except (Cleber Rosa <crosa@redhat.com>) scripts/qmp/qmp-shell | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)