diff options
| author | Eduardo Habkost | 2018-06-21 19:54:51 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2018-06-22 20:45:42 +0200 |
| commit | bf20b675cc5a2568f1105c3577663978c5a13108 (patch) | |
| tree | d8328490cde9bb5b0b9fa2164d60c9a2d05fa919 /scripts/qmp/qmp-shell | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-06-22' into ... (diff) | |
| download | qemu-bf20b675cc5a2568f1105c3577663978c5a13108.tar.gz qemu-bf20b675cc5a2568f1105c3577663978c5a13108.tar.xz qemu-bf20b675cc5a2568f1105c3577663978c5a13108.zip | |
Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import"
Since commit 068cf7a44cd4d65c05aa877dbebced295be5ce44, qmp-shell
is broken:
$ ./scripts/qmp/qmp-shell
Traceback (most recent call last):
File "./scripts/qmp/qmp-shell", line 70, in <module>
from . import qmp
ValueError: Attempted relative import in non-package
Relative imports don't work on scripts that are executed
directly, so revert the change on the scripts inside scripts/qmp.
Fixes: 068cf7a44cd4d65c05aa877dbebced295be5ce44
Reported-by: John Snow <jsnow@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180621175451.7948-1-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'scripts/qmp/qmp-shell')
| -rwxr-xr-x | scripts/qmp/qmp-shell | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 26418dab95..a42306dd89 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -66,8 +66,7 @@ # sent to QEMU, which is useful for debugging and documentation generation. from __future__ import print_function -from __future__ import absolute_import -from . import qmp +import qmp import json import ast import readline |