mirror of https://github.com/proxmox/mirror_qemu
Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import"
Since commitmaster068cf7a44c
, 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:068cf7a44c
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>
parent
7ed14cbf3c
commit
bf20b675cc
|
@ -37,11 +37,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import base64
|
import base64
|
||||||
import random
|
import random
|
||||||
|
|
||||||
from . import qmp
|
import qmp
|
||||||
|
|
||||||
|
|
||||||
class QemuGuestAgent(qmp.QEMUMonitorProtocol):
|
class QemuGuestAgent(qmp.QEMUMonitorProtocol):
|
||||||
|
|
|
@ -11,9 +11,8 @@
|
||||||
# See the COPYING file in the top-level directory.
|
# See the COPYING file in the top-level directory.
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import sys, os
|
import sys, os
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
def print_response(rsp, prefix=[]):
|
def print_response(rsp, prefix=[]):
|
||||||
if type(rsp) == list:
|
if type(rsp) == list:
|
||||||
|
|
|
@ -66,8 +66,7 @@
|
||||||
# sent to QEMU, which is useful for debugging and documentation generation.
|
# sent to QEMU, which is useful for debugging and documentation generation.
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
import qmp
|
||||||
from . import qmp
|
|
||||||
import json
|
import json
|
||||||
import ast
|
import ast
|
||||||
import readline
|
import readline
|
||||||
|
|
|
@ -11,12 +11,11 @@
|
||||||
# the COPYING file in the top-level directory.
|
# the COPYING file in the top-level directory.
|
||||||
##
|
##
|
||||||
|
|
||||||
from __future__ import absolute_import
|
|
||||||
import fuse, stat
|
import fuse, stat
|
||||||
from fuse import Fuse
|
from fuse import Fuse
|
||||||
import os, posix
|
import os, posix
|
||||||
from errno import *
|
from errno import *
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
fuse.fuse_python_api = (0, 2)
|
fuse.fuse_python_api = (0, 2)
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,9 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
cmd, args = sys.argv[0], sys.argv[1:]
|
cmd, args = sys.argv[0], sys.argv[1:]
|
||||||
socket_path = None
|
socket_path = None
|
||||||
|
|
|
@ -12,10 +12,9 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
cmd, args = sys.argv[0], sys.argv[1:]
|
cmd, args = sys.argv[0], sys.argv[1:]
|
||||||
socket_path = None
|
socket_path = None
|
||||||
|
|
|
@ -12,10 +12,9 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
cmd, args = sys.argv[0], sys.argv[1:]
|
cmd, args = sys.argv[0], sys.argv[1:]
|
||||||
socket_path = None
|
socket_path = None
|
||||||
|
|
|
@ -14,10 +14,9 @@
|
||||||
##
|
##
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
from .qmp import QEMUMonitorProtocol
|
from qmp import QEMUMonitorProtocol
|
||||||
|
|
||||||
cmd, args = sys.argv[0], sys.argv[1:]
|
cmd, args = sys.argv[0], sys.argv[1:]
|
||||||
socket_path = None
|
socket_path = None
|
||||||
|
|
Loading…
Reference in New Issue