From nobody Fri Nov 14 18:02:28 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=1589435943; cv=none; d=zohomail.com; s=zohoarc; b=OgUOijD+siBxdLTMaMzWmhZ+VSk5jR0Ks31OKHnkbgmvoiWABlHFLvdbCSNQbptq3jR2GUD3wEGhXuetkBmUxjQniCYtEMiBpDNrTBuQGzI4vYRjt2ekzPStFWb7+fOD76jLVV7iC/g1uEKgrujUfaQrjq4IhtGmgPPXYJ2hbr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589435943; 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=v+ohm4XYXFRwTcdD2vs9B3hxYnBxrDcx8T9ob43s9gU=; b=Z5M3Zsvtuc9KMqZ8fHONFcm2SNbhNifLXihz+woMP6cTDNfcTYiMr56Z5tIaBsJv0M+0z6i6+GTcHmd2aZC27oW1hKDZvt08rLsvt/LT7+aOdoAy30QeyBFZ6XfuL7nWy26Ws4wemGFCQ26iujej7T6fyoo0mMUbrN0gJuBy3Io= 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 1589435943926175.1220903709168; Wed, 13 May 2020 22:59:03 -0700 (PDT) Received: from localhost ([::1]:46540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ6ta-0007V3-K0 for importer@patchew.org; Thu, 14 May 2020 01:59:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pQ-0005QZ-Mf for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:44 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:24155 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 1jZ6pM-0001f4-3C for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:44 -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-253-tOe9s-0ZNleE0_prcAC5XA-1; Thu, 14 May 2020 01:54:35 -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 7293C1054F8B; Thu, 14 May 2020 05:54:34 +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 140986A977; Thu, 14 May 2020 05:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589435679; 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=v+ohm4XYXFRwTcdD2vs9B3hxYnBxrDcx8T9ob43s9gU=; b=DS+YmwwhjGXY3+j5dRdtObQxYY9uifSYf1240jdZBPnnSUabwga9sTdSfGZdx7jjr4aHhy e4HpE/V0KO7ggFhMnRV1vKH62e+0+TsXqEESGgVfMtnyiEjMBXW//hehQmZjE4LTLVzDHh tjKresxVECwceKvwmSOp8Z8WzAJDSMs= X-MC-Unique: tOe9s-0ZNleE0_prcAC5XA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC 13/32] python/qemu/lib: Adjust traceback typing Date: Thu, 14 May 2020 01:53:44 -0400 Message-Id: <20200514055403.18902-14-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" mypy considers it incorrect to use `bool` to statically return false, because it will assume that it could conceivably return True, and gives different analysis in that case. Use a None return to achieve the same effect, but make mypy happy. Note: Pylint considers function signatures as code that might trip the duplicate-code checker. I'd rather not disable this as it does not trigger often in practice, so I'm disabling it as a one-off and filed a change request; see https://github.com/PyCQA/pylint/issues/3619 Signed-off-by: John Snow Acked-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/lib/machine.py | 8 ++++++-- python/qemu/lib/qmp.py | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/python/qemu/lib/machine.py b/python/qemu/lib/machine.py index b2f0412197..2f94c851ed 100644 --- a/python/qemu/lib/machine.py +++ b/python/qemu/lib/machine.py @@ -24,6 +24,8 @@ import shutil import socket import tempfile +from typing import Optional, Type +from types import TracebackType =20 from . import qmp =20 @@ -127,9 +129,11 @@ def __init__(self, binary, args=3DNone, wrapper=3DNone= , name=3DNone, def __enter__(self): return self =20 - def __exit__(self, exc_type, exc_val, exc_tb): + def __exit__(self, + exc_type: Optional[Type[BaseException]], + exc_val: Optional[BaseException], + exc_tb: Optional[TracebackType]) -> None: self.shutdown() - return False =20 def add_monitor_null(self): """ diff --git a/python/qemu/lib/qmp.py b/python/qemu/lib/qmp.py index 73d49050ed..b91c9d5c1c 100644 --- a/python/qemu/lib/qmp.py +++ b/python/qemu/lib/qmp.py @@ -14,7 +14,9 @@ from typing import ( Optional, TextIO, + Type, ) +from types import TracebackType =20 =20 class QMPError(Exception): @@ -146,10 +148,14 @@ def __enter__(self): # Implement context manager enter function. return self =20 - def __exit__(self, exc_type, exc_value, exc_traceback): + def __exit__(self, + # pylint: disable=3Dduplicate-code + # see https://github.com/PyCQA/pylint/issues/3619 + exc_type: Optional[Type[BaseException]], + exc_val: Optional[BaseException], + exc_tb: Optional[TracebackType]) -> None: # Implement context manager exit function. self.close() - return False =20 def connect(self, negotiate=3DTrue): """ --=20 2.21.1