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>

diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 976e69e05f428a8a60bc11aa7526e2371fc21815..e8cb7646a0be1127c6fecaa41085448ae787156a 100755 (executable)
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -37,11 +37,10 @@
 #
 
 from __future__ import print_function
-from __future__ import absolute_import
 import base64
 import random
 
-from . import qmp
+import qmp
 
 
 class QemuGuestAgent(qmp.QEMUMonitorProtocol):

diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
index 33a0d6b73aa0a6fd25c2b65ed6c1d07232569839..6cb46fdae2821bd91b77847a796535b88a013145 100755 (executable)
--- a/scripts/qmp/qmp
+++ b/scripts/qmp/qmp
@@ -11,9 +11,8 @@
 # See the COPYING file in the top-level directory.
 
 from __future__ import print_function
-from __future__ import absolute_import
 import sys, os
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 def print_response(rsp, prefix=[]):
     if type(rsp) == list:

diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 26418dab95c368b05fab32cbd751e762672b13a8..a42306dd8919f90564ca4f5f23ae1f6006a6d940 100755 (executable)
--- 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

diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index e524e798fc019c3865e65bb9184b240d2f69eb05..4d85970a78a8a3296cabb22ca205ad804a709d98 100755 (executable)
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -11,12 +11,11 @@
 # the COPYING file in the top-level directory.
 ##
 
-from __future__ import absolute_import
 import fuse, stat
 from fuse import Fuse
 import os, posix
 from errno import *
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 fuse.fuse_python_api = (0, 2)
 

diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
index a3f5d7660e35468738234f662624c3367057ca80..ec5275d53ad801f01bcff0a35903b3d7980c50d8 100755 (executable)
--- a/scripts/qmp/qom-get
+++ b/scripts/qmp/qom-get
@@ -12,10 +12,9 @@
 ##
 
 from __future__ import print_function
-from __future__ import absolute_import
 import sys
 import os
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 cmd, args = sys.argv[0], sys.argv[1:]
 socket_path = None

diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
index 2ba25e1792715e1d4b8b0e0a610d52801aa921db..0f97440973649eb280d2b8f646c69c4339325cfd 100755 (executable)
--- a/scripts/qmp/qom-list
+++ b/scripts/qmp/qom-list
@@ -12,10 +12,9 @@
 ##
 
 from __future__ import print_function
-from __future__ import absolute_import
 import sys
 import os
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 cmd, args = sys.argv[0], sys.argv[1:]
 socket_path = None

diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index 0352668812ec226032c0730fc50a3b3536e5c0be..26ed9e3263be0cfe4c47604c9bfcad90e18aa572 100755 (executable)
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -12,10 +12,9 @@
 ##
 
 from __future__ import print_function
-from __future__ import absolute_import
 import sys
 import os
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 cmd, args = sys.argv[0], sys.argv[1:]
 socket_path = None

diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
index 32e708a13ebf51d31c607dd351b643f17b01ceb0..31603c681fbf8b241f7a130999f3877ac4cdeeed 100755 (executable)
--- a/scripts/qmp/qom-tree
+++ b/scripts/qmp/qom-tree
@@ -14,10 +14,9 @@
 ##
 
 from __future__ import print_function
-from __future__ import absolute_import
 import sys
 import os
-from .qmp import QEMUMonitorProtocol
+from qmp import QEMUMonitorProtocol
 
 cmd, args = sys.argv[0], sys.argv[1:]
 socket_path = None