From nobody Thu May 2 00:29:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529693452914237.19576255861296; Fri, 22 Jun 2018 11:50:52 -0700 (PDT) Received: from localhost ([::1]:35681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWR92-0005UY-8f for importer@patchew.org; Fri, 22 Jun 2018 14:50:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWR7Y-0004hc-7Y for qemu-devel@nongnu.org; Fri, 22 Jun 2018 14:49:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWR7X-0007gJ-7e for qemu-devel@nongnu.org; Fri, 22 Jun 2018 14:49:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fWR7W-0007g7-Va for qemu-devel@nongnu.org; Fri, 22 Jun 2018 14:49:19 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1A8AE81115; Fri, 22 Jun 2018 18:49:18 +0000 (UTC) Received: from localhost (ovpn-116-16.gru2.redhat.com [10.97.116.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A38572015667; Fri, 22 Jun 2018 18:49:14 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Date: Fri, 22 Jun 2018 15:49:09 -0300 Message-Id: <20180622184909.23381-2-ehabkost@redhat.com> In-Reply-To: <20180622184909.23381-1-ehabkost@redhat.com> References: <20180622184909.23381-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 22 Jun 2018 18:49:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/1] Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , John Snow , Eduardo Habkost , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/qemu-ga-client | 3 +-- scripts/qmp/qmp | 3 +-- scripts/qmp/qmp-shell | 3 +-- scripts/qmp/qom-fuse | 3 +-- scripts/qmp/qom-get | 3 +-- scripts/qmp/qom-list | 3 +-- scripts/qmp/qom-set | 3 +-- scripts/qmp/qom-tree | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index 976e69e05f..e8cb7646a0 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -37,11 +37,10 @@ # =20 from __future__ import print_function -from __future__ import absolute_import import base64 import random =20 -from . import qmp +import qmp =20 =20 class QemuGuestAgent(qmp.QEMUMonitorProtocol): diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp index 33a0d6b73a..6cb46fdae2 100755 --- a/scripts/qmp/qmp +++ b/scripts/qmp/qmp @@ -11,9 +11,8 @@ # See the COPYING file in the top-level directory. =20 from __future__ import print_function -from __future__ import absolute_import import sys, os -from .qmp import QEMUMonitorProtocol +from qmp import QEMUMonitorProtocol =20 def print_response(rsp, prefix=3D[]): if type(rsp) =3D=3D list: diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 26418dab95..a42306dd89 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -66,8 +66,7 @@ # sent to QEMU, which is useful for debugging and documentation generation. =20 from __future__ import print_function -from __future__ import absolute_import -from . import qmp +import qmp import json import ast import readline diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse index e524e798fc..4d85970a78 100755 --- a/scripts/qmp/qom-fuse +++ b/scripts/qmp/qom-fuse @@ -11,12 +11,11 @@ # the COPYING file in the top-level directory. ## =20 -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 =20 fuse.fuse_python_api =3D (0, 2) =20 diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get index a3f5d7660e..ec5275d53a 100755 --- a/scripts/qmp/qom-get +++ b/scripts/qmp/qom-get @@ -12,10 +12,9 @@ ## =20 from __future__ import print_function -from __future__ import absolute_import import sys import os -from .qmp import QEMUMonitorProtocol +from qmp import QEMUMonitorProtocol =20 cmd, args =3D sys.argv[0], sys.argv[1:] socket_path =3D None 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 @@ ## =20 from __future__ import print_function -from __future__ import absolute_import import sys import os -from .qmp import QEMUMonitorProtocol +from qmp import QEMUMonitorProtocol =20 cmd, args =3D sys.argv[0], sys.argv[1:] socket_path =3D None diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set index 0352668812..26ed9e3263 100755 --- a/scripts/qmp/qom-set +++ b/scripts/qmp/qom-set @@ -12,10 +12,9 @@ ## =20 from __future__ import print_function -from __future__ import absolute_import import sys import os -from .qmp import QEMUMonitorProtocol +from qmp import QEMUMonitorProtocol =20 cmd, args =3D sys.argv[0], sys.argv[1:] socket_path =3D None diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree index 32e708a13e..31603c681f 100755 --- a/scripts/qmp/qom-tree +++ b/scripts/qmp/qom-tree @@ -14,10 +14,9 @@ ## =20 from __future__ import print_function -from __future__ import absolute_import import sys import os -from .qmp import QEMUMonitorProtocol +from qmp import QEMUMonitorProtocol =20 cmd, args =3D sys.argv[0], sys.argv[1:] socket_path =3D None --=20 2.18.0.rc1.1.g3f1ff2140