Skip to content

Commit

Permalink
Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_…
Browse files Browse the repository at this point in the history
…import"

Since commit 068cf7a, 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: 068cf7a
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>
  • Loading branch information
ehabkost committed Jun 22, 2018
1 parent 7ed14cb commit bf20b67
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 16 deletions.
3 changes: 1 addition & 2 deletions scripts/qmp/qemu-ga-client
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qmp
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qmp-shell
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qom-fuse
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qom-get
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qom-list
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qom-set
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/qmp/qom-tree
Expand Up @@ -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
Expand Down

0 comments on commit bf20b67

Please sign in to comment.