Commit bf20b675 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import" 



Since commit 068cf7a4, 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: 068cf7a4
Reported-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180621175451.7948-1-ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 7ed14cbf

scripts/qmp/qemu-ga-client

+1 −2
Original line number Diff line number Diff line
@@ -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):

scripts/qmp/qmp

+1 −2
Original line number Diff line number Diff line
@@ -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:

scripts/qmp/qmp-shell

+1 −2
Original line number Diff line number Diff line
@@ -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

scripts/qmp/qom-fuse

+1 −2
Original line number Diff line number Diff line
@@ -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)

scripts/qmp/qom-get

+1 −2
Original line number Diff line number Diff line
@@ -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