xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-04 11:09:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eduardo Habkost 2018-06-21 14:54:51 -03:00
parent 7ed14cbf3c
commit bf20b675cc
8 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/qmp/qemu-ga-client
View File

@ -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):

3
scripts/qmp/qmp
View File

@ -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:

3
scripts/qmp/qmp-shell
View File

@ -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

3
scripts/qmp/qom-fuse
View File

@ -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)

3
scripts/qmp/qom-get
View File

@ -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

3
scripts/qmp/qom-list
View File

@ -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

3
scripts/qmp/qom-set
View File

@ -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

3
scripts/qmp/qom-tree
View File

@ -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