From nobody Fri Nov 14 18:02:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589435921; cv=none; d=zohomail.com; s=zohoarc; b=Y4boT5RnCBlmebnhqV+WBizfvr/60banOa3JdXLmiXF1LkZVlBKIA1kNugwrEmeF9SWnAmJhyMi6QqqWISGxjolID3emtDs+IUOum89ZhFbQlTqk6s8oAbuzt+sf8EvOqKQqWl/PZS93n3ZPHNT3j/aFxsggSQPOb248xEosMXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589435921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eIVREeXd6nvTZkOSZ5iRHZDJSFp7tIw6PyIaTwCOjGQ=; b=Q8Y3Ff1YLzkn5d8ywo80UItRqGXe4pL4XmZMNmi+myc0UrE3ie0qc7W89hOvpQN3Gu/MyKxmN0jfP1AR1MaqZLZLtg23YJZ0AviDoG463Hsw4z4wAlMXH5GPIcGuVePMaOJfU8giNi55/NbDgYSPCRLItr0n3U8HqYyPWozCjGk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589435921107891.01281536569; Wed, 13 May 2020 22:58:41 -0700 (PDT) Received: from localhost ([::1]:44096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ6tD-0006XT-TL for importer@patchew.org; Thu, 14 May 2020 01:58:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ6p2-0004Z9-QQ for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:20 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48472 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZ6p2-0001b3-0Y for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:20 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-503-aBVQFwdkNA2zDIkkVPt0qA-1; Thu, 14 May 2020 01:54:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEC341054F8F; Thu, 14 May 2020 05:54:13 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-9.rdu2.redhat.com [10.10.113.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85D067D952; Thu, 14 May 2020 05:54:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589435658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eIVREeXd6nvTZkOSZ5iRHZDJSFp7tIw6PyIaTwCOjGQ=; b=P+uVGgvcgQRG7udCDuGzc3gJUhF24JVM5tzTnJ6Pscfs43mtzo3eJDT2y/vICbl2Z8uV1l r6s8gWTjxd80CdZ5WmJ8nlS8PXHJg2/VvMh0qPKxb557i3yIm0dgvuS1/nAdMMdID0KiNb xI05HwwknNItJs/TuTcmvetnBUESZy0= X-MC-Unique: aBVQFwdkNA2zDIkkVPt0qA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC 05/32] python/qemu/lib: delint; add flake8 config Date: Thu, 14 May 2020 01:53:36 -0400 Message-Id: <20200514055403.18902-6-jsnow@redhat.com> In-Reply-To: <20200514055403.18902-1-jsnow@redhat.com> References: <20200514055403.18902-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 22:25:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Max Reitz , John Snow , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Mostly, ignore the "no bare except" rule, because flake8 is not contextual and cannot determine if we re-raise. Pylint can, though, so always prefer pylint for that. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/lib/.flake8 | 2 ++ python/qemu/lib/accel.py | 9 ++++++--- python/qemu/lib/machine.py | 13 +++++++++---- python/qemu/lib/qmp.py | 4 ++-- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 python/qemu/lib/.flake8 diff --git a/python/qemu/lib/.flake8 b/python/qemu/lib/.flake8 new file mode 100644 index 0000000000..45d8146f3f --- /dev/null +++ b/python/qemu/lib/.flake8 @@ -0,0 +1,2 @@ +[flake8] +extend-ignore =3D E722 # Pylint handles this, but smarter. \ No newline at end of file diff --git a/python/qemu/lib/accel.py b/python/qemu/lib/accel.py index 36ae85791e..7fabe62920 100644 --- a/python/qemu/lib/accel.py +++ b/python/qemu/lib/accel.py @@ -23,11 +23,12 @@ # Mapping host architecture to any additional architectures it can # support which often includes its 32 bit cousin. ADDITIONAL_ARCHES =3D { - "x86_64" : "i386", - "aarch64" : "armhf", - "ppc64le" : "ppc64", + "x86_64": "i386", + "aarch64": "armhf", + "ppc64le": "ppc64", } =20 + def list_accel(qemu_bin): """ List accelerators enabled in the QEMU binary. @@ -47,6 +48,7 @@ def list_accel(qemu_bin): # Skip the first line which is the header. return [acc.strip() for acc in out.splitlines()[1:]] =20 + def kvm_available(target_arch=3DNone, qemu_bin=3DNone): """ Check if KVM is available using the following heuristic: @@ -69,6 +71,7 @@ def kvm_available(target_arch=3DNone, qemu_bin=3DNone): return False return True =20 + def tcg_available(qemu_bin): """ Check if TCG is available. diff --git a/python/qemu/lib/machine.py b/python/qemu/lib/machine.py index c79fc8fb89..4b260fa2cb 100644 --- a/python/qemu/lib/machine.py +++ b/python/qemu/lib/machine.py @@ -29,6 +29,7 @@ =20 LOG =3D logging.getLogger(__name__) =20 + class QEMUMachineError(Exception): """ Exception called when an error in QEMUMachine happens. @@ -62,7 +63,8 @@ class QEMUMachine: """ A QEMU VM =20 - Use this object as a context manager to ensure the QEMU process termin= ates:: + Use this object as a context manager to ensure + the QEMU process terminates:: =20 with VM(binary) as vm: ... @@ -188,8 +190,10 @@ def send_fd_scm(self, fd=3DNone, file_path=3DNone): fd_param.append(str(fd)) =20 devnull =3D open(os.path.devnull, 'rb') - proc =3D subprocess.Popen(fd_param, stdin=3Ddevnull, stdout=3Dsubp= rocess.PIPE, - stderr=3Dsubprocess.STDOUT, close_fds=3DFa= lse) + proc =3D subprocess.Popen( + fd_param, stdin=3Ddevnull, stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.STDOUT, close_fds=3DFalse + ) output =3D proc.communicate()[0] if output: LOG.debug(output) @@ -491,7 +495,8 @@ def event_wait(self, name, timeout=3D60.0, match=3DNone= ): =20 def events_wait(self, events, timeout=3D60.0): """ - events_wait waits for and returns a named event from QMP with a ti= meout. + events_wait waits for and returns a named event + from QMP with a timeout. =20 events: a sequence of (name, match_criteria) tuples. The match criteria are optional and may be None. diff --git a/python/qemu/lib/qmp.py b/python/qemu/lib/qmp.py index d6c9b2f4b1..6ae7693965 100644 --- a/python/qemu/lib/qmp.py +++ b/python/qemu/lib/qmp.py @@ -168,8 +168,8 @@ def accept(self, timeout=3D15.0): =20 @param timeout: timeout in seconds (nonnegative float number, or None). The value passed will set the behavior of t= he - underneath QMP socket as described in [1]. Default= value - is set to 15.0. + underneath QMP socket as described in [1]. + Default value is set to 15.0. @return QMP greeting dict @raise OSError on socket connection errors @raise QMPConnectError if the greeting is not received --=20 2.21.1