From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59C3AC35247 for ; Tue, 4 Feb 2020 17:36:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14C052082E for ; Tue, 4 Feb 2020 17:36:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rZo+Y4Wk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14C052082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iz27j-0003Aq-Am for qemu-devel@archiver.kernel.org; Tue, 04 Feb 2020 12:36:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iz23S-00069K-NH for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:32:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iz23P-0001SJ-RS for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:32:06 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iz23P-0001Jz-En for qemu-devel@nongnu.org; Tue, 04 Feb 2020 12:32:03 -0500 Received: by mail-wm1-x344.google.com with SMTP id f129so4711330wmf.2 for ; Tue, 04 Feb 2020 09:32:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=RXy1rGdfF/FS5oikRVKAtOv4DLvjI717xSmpci11YDo=; b=rZo+Y4WkLKPa3odQgh9MZfG+vJ0ZZry9hsZs8hPMPlvMZ7tJi0efPgzq/ZqcNpd5/N jtKZMGBAMUEaQJnfo8APHBI1iMPsJCJQ7y9In183BKzmwwLUzPdtk6+0/SIcw2Nhhcui TLwCTFr3D+3czgdQMhU/NqBeoE9tjm2jPN+LB2HRvU1iblWo4gdfokCxp2SgWBsNwxSS 3Y6iA01o2oJwIReczGU68jy4Vp+BkpjXnrgt2wiGmDOm+qvgTTcprKqSiocySXmevXFr kfKlhc8vdb7AgXQif/fdi5s7IrOknLHcQtYpB/VLmulLEvD8Qq8E51Ah8g6oDOF+P+QT 2AGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=RXy1rGdfF/FS5oikRVKAtOv4DLvjI717xSmpci11YDo=; b=i/HUF7RtAtHaFoe7Ml6eLTEzPmRn0Nm437U7grzIrdUtasuKgXZcAfoj/nE6kCyTY3 O2x//5l+HHQz4js7s3DCJqQ68Im9hIycWvwJiBr1Dwj/7FKUf4GNg6/D/E0S3YhxsxVM 1UnvRnMVOC3h3kWTyZYKcuSulUkljHuFLTe8CvFq/GMD7abGO8ndORuPAjxMsFrtMFD7 0pYOjxW3YAxwduihDyPQSFsZ6ozePOdGKOkH74w6/JSx5Kz0SQwByGqlv1iUrK3/5vXD y2R2RrBCTV8oLEdgdMalQj16X01puOc2lavVKwzhJ9yCM+nOf4jA/1n4Hzmcc/eEH53N ftaw== X-Gm-Message-State: APjAAAVhuJ8U5YjMxSjV8eXREaDalxyUdFzYkIOvoOCZKvwsliShiy1N WLQo9e3ywgqVz30UjI1E6tcLdHtVZI0= X-Google-Smtp-Source: APXvYqy9slbhF9Ufa9l5F2Sdo7DRweEQKM2yAB6RHZA2z43p/bGNRs5j/YqoZFRvzLwbH4bMnGDt0Q== X-Received: by 2002:a7b:c318:: with SMTP id k24mr142835wmj.54.1580837521056; Tue, 04 Feb 2020 09:32:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a198sm4468484wme.12.2020.02.04.09.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 09:32:00 -0800 (PST) Received: from zen (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 563FF1FF87; Tue, 4 Feb 2020 17:31:59 +0000 (GMT) References: <20200204160604.19883-1-pbonzini@redhat.com> User-agent: mu4e 1.3.7; emacs 27.0.60 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: Paolo Bonzini Subject: Re: [PATCH] drop "from __future__ import print_function" In-reply-to: <20200204160604.19883-1-pbonzini@redhat.com> Date: Tue, 04 Feb 2020 17:31:59 +0000 Message-ID: <87wo928dio.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Paolo Bonzini writes: > This is only needed for Python 2, which we do not support anymore. > > Based-on: <20200204160028.16211-1-pbonzini@redhat.com> > Cc: Philippe Mathieu-Daud=C3=A9 > Signed-off-by: Paolo Bonzini testing bits Acked-by: Alex Benn=C3=A9e > --- > scripts/analyse-9p-simpletrace.py | 1 - > scripts/analyse-locks-simpletrace.py | 1 - > scripts/device-crash-test | 1 - > scripts/dump-guest-memory.py | 1 - > scripts/kvm/kvm_flightrecorder | 1 - > scripts/kvm/vmxcap | 1 - > scripts/minikconf.py | 1 - > scripts/modules/module_block.py | 1 - > scripts/qapi-gen.py | 1 - > scripts/qapi/doc.py | 1 - > scripts/qmp/qemu-ga-client | 1 - > scripts/qmp/qmp | 1 - > scripts/qmp/qmp-shell | 1 - > scripts/qmp/qom-get | 1 - > scripts/qmp/qom-list | 1 - > scripts/qmp/qom-set | 1 - > scripts/qmp/qom-tree | 1 - > scripts/replay-dump.py | 1 - > scripts/signrom.py | 1 - > scripts/simpletrace.py | 1 - > scripts/vmstate-static-checker.py | 1 - > tests/docker/travis.py | 1 - > tests/guest-debug/test-gdbstub.py | 1 - > tests/migration/guestperf/engine.py | 1 - > tests/migration/guestperf/plot.py | 1 - > tests/migration/guestperf/shell.py | 1 - > tests/qapi-schema/test-qapi.py | 1 - > tests/qemu-iotests/149 | 1 - > tests/qemu-iotests/165 | 1 - > tests/qemu-iotests/iotests.py | 1 - > tests/qemu-iotests/nbd-fault-injector.py | 1 - > tests/qemu-iotests/qcow2.py | 1 - > tests/qemu-iotests/qed.py | 1 - > tests/vm/basevm.py | 1 - > 34 files changed, 34 deletions(-) > > diff --git a/scripts/analyse-9p-simpletrace.py b/scripts/analyse-9p-simpl= etrace.py > index f20050fddd..7dfcb6ba2f 100755 > --- a/scripts/analyse-9p-simpletrace.py > +++ b/scripts/analyse-9p-simpletrace.py > @@ -3,7 +3,6 @@ > # Usage: ./analyse-9p-simpletrace > # > # Author: Harsh Prateek Bora > -from __future__ import print_function > import os > import simpletrace >=20=20 > diff --git a/scripts/analyse-locks-simpletrace.py b/scripts/analyse-locks= -simpletrace.py > index 9c263d6e79..63c11f4fce 100755 > --- a/scripts/analyse-locks-simpletrace.py > +++ b/scripts/analyse-locks-simpletrace.py > @@ -6,7 +6,6 @@ > # Author: Alex Benn=C3=A9e > # >=20=20 > -from __future__ import print_function > import simpletrace > import argparse > import numpy as np > diff --git a/scripts/device-crash-test b/scripts/device-crash-test > index 25ee968b66..305d0427af 100755 > --- a/scripts/device-crash-test > +++ b/scripts/device-crash-test > @@ -23,7 +23,6 @@ > Run QEMU with all combinations of -machine and -device types, > check for crashes and unexpected errors. > """ > -from __future__ import print_function >=20=20 > import os > import sys > diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py > index 9371e45813..4177261d33 100644 > --- a/scripts/dump-guest-memory.py > +++ b/scripts/dump-guest-memory.py > @@ -12,7 +12,6 @@ Authors: > This work is licensed under the terms of the GNU GPL, version 2 or later= . See > the COPYING file in the top-level directory. > """ > -from __future__ import print_function >=20=20 > import ctypes > import struct > diff --git a/scripts/kvm/kvm_flightrecorder b/scripts/kvm/kvm_flightrecor= der > index 1391a84409..78ca3af9c4 100755 > --- a/scripts/kvm/kvm_flightrecorder > +++ b/scripts/kvm/kvm_flightrecorder > @@ -32,7 +32,6 @@ > # consuming CPU cycles. No disk I/O is performed since the ring buffer = holds a > # fixed-size in-memory trace. >=20=20 > -from __future__ import print_function > import sys > import os >=20=20 > diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap > index 5dfeb2e03a..971ed0e721 100755 > --- a/scripts/kvm/vmxcap > +++ b/scripts/kvm/vmxcap > @@ -10,7 +10,6 @@ > # This work is licensed under the terms of the GNU GPL, version 2. See > # the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function > MSR_IA32_VMX_BASIC =3D 0x480 > MSR_IA32_VMX_PINBASED_CTLS =3D 0x481 > MSR_IA32_VMX_PROCBASED_CTLS =3D 0x482 > diff --git a/scripts/minikconf.py b/scripts/minikconf.py > index 377d6228b9..2f9647d0fa 100755 > --- a/scripts/minikconf.py > +++ b/scripts/minikconf.py > @@ -11,7 +11,6 @@ > # or, at your option, any later version. See the COPYING file in > # the top-level directory. >=20=20 > -from __future__ import print_function > import os > import sys > import re > diff --git a/scripts/modules/module_block.py b/scripts/modules/module_blo= ck.py > index 08646af92c..f23191fac1 100644 > --- a/scripts/modules/module_block.py > +++ b/scripts/modules/module_block.py > @@ -10,7 +10,6 @@ > # This work is licensed under the terms of the GNU GPL, version 2. > # See the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function > import sys > import os >=20=20 > diff --git a/scripts/qapi-gen.py b/scripts/qapi-gen.py > index c7b0070db2..4b03f7d53b 100755 > --- a/scripts/qapi-gen.py > +++ b/scripts/qapi-gen.py > @@ -4,7 +4,6 @@ > # This work is licensed under the terms of the GNU GPL, version 2 or lat= er. > # See the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function >=20=20 > import argparse > import re > diff --git a/scripts/qapi/doc.py b/scripts/qapi/doc.py > index 6f1c17f71f..1787a53d91 100644 > --- a/scripts/qapi/doc.py > +++ b/scripts/qapi/doc.py > @@ -4,7 +4,6 @@ > # See the COPYING file in the top-level directory. > """This script produces the documentation of a qapi schema in texinfo fo= rmat""" >=20=20 > -from __future__ import print_function > import re > from qapi.gen import QAPIGenDoc, QAPISchemaVisitor >=20=20 > diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client > index e4568aff68..ce122984a9 100755 > --- a/scripts/qmp/qemu-ga-client > +++ b/scripts/qmp/qemu-ga-client > @@ -36,7 +36,6 @@ > # See also: https://wiki.qemu.org/Features/QAPI/GuestAgent > # >=20=20 > -from __future__ import print_function > import os > import sys > import base64 > diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp > index f85a14a627..0625fc2aba 100755 > --- a/scripts/qmp/qmp > +++ b/scripts/qmp/qmp > @@ -10,7 +10,6 @@ > # This work is licensed under the terms of the GNU GPLv2 or later. > # See the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function > import sys, os > from qmp import QEMUMonitorProtocol >=20=20 > diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell > index 9e122ad0c6..a01d31de1e 100755 > --- a/scripts/qmp/qmp-shell > +++ b/scripts/qmp/qmp-shell > @@ -65,7 +65,6 @@ > # which will echo back the properly formatted JSON-compliant QMP that is= being > # sent to QEMU, which is useful for debugging and documentation generati= on. >=20=20 > -from __future__ import print_function > import json > import ast > import readline > diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get > index ec5275d53a..007b4cd442 100755 > --- a/scripts/qmp/qom-get > +++ b/scripts/qmp/qom-get > @@ -11,7 +11,6 @@ > # the COPYING file in the top-level directory. > ## >=20=20 > -from __future__ import print_function > import sys > import os > from qmp import QEMUMonitorProtocol > diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list > index 0f97440973..03bda3446b 100755 > --- a/scripts/qmp/qom-list > +++ b/scripts/qmp/qom-list > @@ -11,7 +11,6 @@ > # the COPYING file in the top-level directory. > ## >=20=20 > -from __future__ import print_function > import sys > import os > from qmp import QEMUMonitorProtocol > diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set > index 26ed9e3263..c37fe78b00 100755 > --- a/scripts/qmp/qom-set > +++ b/scripts/qmp/qom-set > @@ -11,7 +11,6 @@ > # the COPYING file in the top-level directory. > ## >=20=20 > -from __future__ import print_function > import sys > import os > from qmp import QEMUMonitorProtocol > diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree > index 31603c681f..1c8acf61e7 100755 > --- a/scripts/qmp/qom-tree > +++ b/scripts/qmp/qom-tree > @@ -13,7 +13,6 @@ > # the COPYING file in the top-level directory. > ## >=20=20 > -from __future__ import print_function > import sys > import os > from qmp import QEMUMonitorProtocol > diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py > index 0cdae879b7..4cbc1e47c6 100755 > --- a/scripts/replay-dump.py > +++ b/scripts/replay-dump.py > @@ -18,7 +18,6 @@ > # You should have received a copy of the GNU Lesser General Public > # License along with this library; if not, see . >=20=20 > -from __future__ import print_function > import argparse > import struct > from collections import namedtuple > diff --git a/scripts/signrom.py b/scripts/signrom.py > index 9be5dab1cf..43693dba56 100755 > --- a/scripts/signrom.py > +++ b/scripts/signrom.py > @@ -1,6 +1,5 @@ > #!/usr/bin/env python3 >=20=20 > -from __future__ import print_function > # > # Option ROM signing utility > # > diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py > index 2bc043112a..20f0026066 100755 > --- a/scripts/simpletrace.py > +++ b/scripts/simpletrace.py > @@ -9,7 +9,6 @@ > # > # For help see docs/devel/tracing.txt >=20=20 > -from __future__ import print_function > import struct > import inspect > from tracetool import read_events, Event > diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-c= hecker.py > index d44dedd9e9..539ead62b4 100755 > --- a/scripts/vmstate-static-checker.py > +++ b/scripts/vmstate-static-checker.py > @@ -19,7 +19,6 @@ > # You should have received a copy of the GNU General Public License along > # with this program; if not, see . >=20=20 > -from __future__ import print_function > import argparse > import json > import sys > diff --git a/tests/docker/travis.py b/tests/docker/travis.py > index 62fccc5ebb..37307ac366 100755 > --- a/tests/docker/travis.py > +++ b/tests/docker/travis.py > @@ -11,7 +11,6 @@ > # or (at your option) any later version. See the COPYING file in > # the top-level directory. >=20=20 > -from __future__ import print_function > import sys > import yaml > import itertools > diff --git a/tests/guest-debug/test-gdbstub.py b/tests/guest-debug/test-g= dbstub.py > index c7e3986a24..98a5df4d42 100644 > --- a/tests/guest-debug/test-gdbstub.py > +++ b/tests/guest-debug/test-gdbstub.py > @@ -1,4 +1,3 @@ > -from __future__ import print_function > # > # This script needs to be run on startup > # qemu -kernel ${KERNEL} -s -S > diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestp= erf/engine.py > index 1dd04ce33b..fd63c66601 100644 > --- a/tests/migration/guestperf/engine.py > +++ b/tests/migration/guestperf/engine.py > @@ -1,4 +1,3 @@ > -from __future__ import print_function > # > # Migration test main engine > # > diff --git a/tests/migration/guestperf/plot.py b/tests/migration/guestper= f/plot.py > index aa98912a82..34cebd54ba 100644 > --- a/tests/migration/guestperf/plot.py > +++ b/tests/migration/guestperf/plot.py > @@ -1,4 +1,3 @@ > -from __future__ import print_function > # > # Migration test graph plotting > # > diff --git a/tests/migration/guestperf/shell.py b/tests/migration/guestpe= rf/shell.py > index 61d2abbaad..5bcc066bb9 100644 > --- a/tests/migration/guestperf/shell.py > +++ b/tests/migration/guestperf/shell.py > @@ -1,4 +1,3 @@ > -from __future__ import print_function > # > # Migration test command line shell integration > # > diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi= .py > index 503fb8ad25..41232c11a3 100755 > --- a/tests/qapi-schema/test-qapi.py > +++ b/tests/qapi-schema/test-qapi.py > @@ -11,7 +11,6 @@ > # See the COPYING file in the top-level directory. > # >=20=20 > -from __future__ import print_function >=20=20 > import argparse > import difflib > diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 > index 0a7b765d07..b4a21bf7b7 100755 > --- a/tests/qemu-iotests/149 > +++ b/tests/qemu-iotests/149 > @@ -20,7 +20,6 @@ > # Exercise the QEMU 'luks' block driver to validate interoperability > # with the Linux dm-crypt + cryptsetup implementation >=20=20 > -from __future__ import print_function > import subprocess > import os > import os.path > diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165 > index b60a803dae..fb56a769b4 100755 > --- a/tests/qemu-iotests/165 > +++ b/tests/qemu-iotests/165 > @@ -18,7 +18,6 @@ > # along with this program. If not, see . > # >=20=20 > -from __future__ import print_function > import os > import re > import iotests > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 0b62c42851..1689b25bdc 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -1,4 +1,3 @@ > -from __future__ import print_function > # Common utilities and Python wrappers for qemu-iotests > # > # Copyright (C) 2012 IBM Corp. > diff --git a/tests/qemu-iotests/nbd-fault-injector.py b/tests/qemu-iotest= s/nbd-fault-injector.py > index b158dd65a2..588d62aebf 100755 > --- a/tests/qemu-iotests/nbd-fault-injector.py > +++ b/tests/qemu-iotests/nbd-fault-injector.py > @@ -43,7 +43,6 @@ > # This work is licensed under the terms of the GNU GPL, version 2 or lat= er. > # See the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function > import sys > import socket > import struct > diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py > index 1c4fa2b09f..94a07b2f6f 100755 > --- a/tests/qemu-iotests/qcow2.py > +++ b/tests/qemu-iotests/qcow2.py > @@ -1,6 +1,5 @@ > #!/usr/bin/env python3 >=20=20 > -from __future__ import print_function > import sys > import struct > import string > diff --git a/tests/qemu-iotests/qed.py b/tests/qemu-iotests/qed.py > index 36bca1de23..d6bec96069 100755 > --- a/tests/qemu-iotests/qed.py > +++ b/tests/qemu-iotests/qed.py > @@ -10,7 +10,6 @@ > # This work is licensed under the terms of the GNU GPL, version 2 or lat= er. > # See the COPYING file in the top-level directory. >=20=20 > -from __future__ import print_function > import sys > import struct > import random > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 30714fa1a8..4dee6647e6 100644 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -11,7 +11,6 @@ > # the COPYING file in the top-level directory. > # >=20=20 > -from __future__ import print_function > import os > import re > import sys --=20 Alex Benn=C3=A9e