From bf20b675cc5a2568f1105c3577663978c5a13108 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 21 Jun 2018 14:54:51 -0300 Subject: 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 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 Signed-off-by: Eduardo Habkost Message-Id: <20180621175451.7948-1-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- scripts/qmp/qom-list | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/qmp/qom-list') diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list index 2ba25e1792..0f97440973 100755 --- 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 -- cgit v1.2.3