| Message ID | 20190618142931.1694-1-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qmp: make qmp-shell work with python3 | expand |
On Tue, Jun 18, 2019 at 10:29:31AM -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> > --- > 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 Something like: if sys.version_info[0] == 2: input = raw_input Also does the job, and may be considered simpler and easier to read. - Cleber. > + cmdline = input(prompt) > except EOFError: > print() > return False > -- > 2.18.1 >
On Wed, 19 Jun 2019 09:29:24 -0400 Cleber Rosa <crosa@redhat.com> wrote: > On Tue, Jun 18, 2019 at 10:29:31AM -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> > > --- > > 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 > > Something like: > > if sys.version_info[0] == 2: > input = raw_input > > Also does the job, and may be considered simpler and easier to read. that causes scope issues on python3 > > - Cleber. > > > + cmdline = input(prompt) > > except EOFError: > > print() > > return False > > -- > > 2.18.1 > > >
On Thu, Jun 20, 2019 at 11:11:03AM +0200, Igor Mammedov wrote: > On Wed, 19 Jun 2019 09:29:24 -0400 > Cleber Rosa <crosa@redhat.com> wrote: > > > On Tue, Jun 18, 2019 at 10:29:31AM -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> > > > --- > > > 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 > > > > Something like: > > > > if sys.version_info[0] == 2: > > input = raw_input > > > > Also does the job, and may be considered simpler and easier to read. > > that causes scope issues on python3 Which issues? It should work if you set it at the module top level. We had done this before in other scripts. e.g.: $ git grep -1 'range = xrange' tests/qemu-iotests/044-if sys.version_info.major == 2: tests/qemu-iotests/044: range = xrange tests/qemu-iotests/044- -- tests/qemu-iotests/163-if sys.version_info.major == 2: tests/qemu-iotests/163: range = xrange tests/qemu-iotests/163-
On Thu, 20 Jun 2019 10:45:24 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > On Thu, Jun 20, 2019 at 11:11:03AM +0200, Igor Mammedov wrote: > > On Wed, 19 Jun 2019 09:29:24 -0400 > > Cleber Rosa <crosa@redhat.com> wrote: > > > > > On Tue, Jun 18, 2019 at 10:29:31AM -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> > > > > --- > > > > 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 > > > > > > Something like: > > > > > > if sys.version_info[0] == 2: > > > input = raw_input > > > > > > Also does the job, and may be considered simpler and easier to read. > > > > that causes scope issues on python3 > > Which issues? It should work if you set it at the module top > level. We had done this before in other scripts. e.g.: it works if it is moved to the top, I'll post v2 > $ git grep -1 'range = xrange' > tests/qemu-iotests/044-if sys.version_info.major == 2: > tests/qemu-iotests/044: range = xrange > tests/qemu-iotests/044- > -- > tests/qemu-iotests/163-if sys.version_info.major == 2: > tests/qemu-iotests/163: range = xrange > tests/qemu-iotests/163- > >
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
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> --- scripts/qmp/qmp-shell | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)