From nobody Fri Nov 14 18:02:33 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=1589436392; cv=none; d=zohomail.com; s=zohoarc; b=bnzRKbTXuUTqykC6i/bW19G/73St2K4+5wZ6hA+Lw5YpFzBT0//7qV4DxQf3iH1VgqnksSpUT6uWdPVJB64K8tAXAVoJG4p7BY7gyO5uHp3HsCqwZockiqFHBE+tIE9Q00Qt8us1gnc+pTKPbdmB4U5esUd49SWW0rbDTKCwpSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589436392; 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=qRLuNsUV4q6lrwdDP4dnHXeBvVF8C22HGPdVkR9yFzg=; b=He2Ob4FTW+YajzVkr3PfudUATjZq7mojxo86jS++efVuqh40Rayurvw0m16pOXpVQwLIk/6JvxnMQGSoZFeaYd2Dlp9lqJcn/cGmy4VvVgos1cuQBDrAGsD8hKOEBE9E6i82eFJsJJxa+3XbD+aBVLeyqyT3yW15tgh9BS/gWP4= 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 158943639212062.72325752038671; Wed, 13 May 2020 23:06:32 -0700 (PDT) Received: from localhost ([::1]:50822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ70o-0005aN-Re for importer@patchew.org; Thu, 14 May 2020 02:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pc-0005ja-Uc for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46404 helo=us-smtp-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 1jZ6pb-0001hY-5O for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:56 -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-47-MyrWZbVGOUWYjjTJXVQDiw-1; Thu, 14 May 2020 01:54:34 -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 DCE7F107ACCD; Thu, 14 May 2020 05:54:32 +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 B5C6F6A977; Thu, 14 May 2020 05:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589435694; 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=qRLuNsUV4q6lrwdDP4dnHXeBvVF8C22HGPdVkR9yFzg=; b=M0N5MQM+saDU7MCNPYUb5Jht6rDK55Qq2hpgRO7tR2K6PD8Pv8C89acNCiwUStWjMNSDhA /xtbBIF2ZJO9glvgksfaiEoPa6EpkKiJEf4YBWHl3iE8Ub+yHC+0xQMSW3+xsxtZYBMYJV p1bvUB4yMBpGIEzf+QnN3czbv1FIRMI= X-MC-Unique: MyrWZbVGOUWYjjTJXVQDiw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC 12/32] python/qemu/lib: fix socket.makefile() typing Date: Thu, 14 May 2020 01:53:43 -0400 Message-Id: <20200514055403.18902-13-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.120; envelope-from=jsnow@redhat.com; helo=us-smtp-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, RCVD_IN_MSPIKE_H2=-0.001, 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" Note: A bug in typeshed (https://github.com/python/typeshed/issues/3977) misinterprets the type of makefile(). Work around this by explicitly stating that we are opening a text-mode file. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/lib/qmp.py | 10 +++++++--- python/qemu/lib/qtest.py | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/python/qemu/lib/qmp.py b/python/qemu/lib/qmp.py index 6ae7693965..73d49050ed 100644 --- a/python/qemu/lib/qmp.py +++ b/python/qemu/lib/qmp.py @@ -11,6 +11,10 @@ import errno import socket import logging +from typing import ( + Optional, + TextIO, +) =20 =20 class QMPError(Exception): @@ -61,7 +65,7 @@ def __init__(self, address, server=3DFalse, nickname=3DNo= ne): self.__events =3D [] self.__address =3D address self.__sock =3D self.__get_sock() - self.__sockfile =3D None + self.__sockfile: Optional[TextIO] =3D None self._nickname =3D nickname if self._nickname: self.logger =3D logging.getLogger('QMP').getChild(self._nickna= me) @@ -157,7 +161,7 @@ def connect(self, negotiate=3DTrue): @raise QMPCapabilitiesError if fails to negotiate capabilities """ self.__sock.connect(self.__address) - self.__sockfile =3D self.__sock.makefile() + self.__sockfile =3D self.__sock.makefile(mode=3D'r') if negotiate: return self.__negotiate_capabilities() return None @@ -180,7 +184,7 @@ def accept(self, timeout=3D15.0): """ self.__sock.settimeout(timeout) self.__sock, _ =3D self.__sock.accept() - self.__sockfile =3D self.__sock.makefile() + self.__sockfile =3D self.__sock.makefile(mode=3D'r') return self.__negotiate_capabilities() =20 def cmd_obj(self, qmp_cmd): diff --git a/python/qemu/lib/qtest.py b/python/qemu/lib/qtest.py index 7943487c2b..4c88590eb0 100644 --- a/python/qemu/lib/qtest.py +++ b/python/qemu/lib/qtest.py @@ -19,6 +19,7 @@ =20 import socket import os +from typing import Optional, TextIO =20 from .machine import QEMUMachine =20 @@ -40,7 +41,7 @@ class QEMUQtestProtocol: def __init__(self, address, server=3DFalse): self._address =3D address self._sock =3D self._get_sock() - self._sockfile =3D None + self._sockfile: Optional[TextIO] =3D None if server: self._sock.bind(self._address) self._sock.listen(1) @@ -59,7 +60,7 @@ def connect(self): @raise socket.error on socket connection errors """ self._sock.connect(self._address) - self._sockfile =3D self._sock.makefile() + self._sockfile =3D self._sock.makefile(mode=3D'r') =20 def accept(self): """ @@ -68,7 +69,7 @@ def accept(self): @raise socket.error on socket connection errors """ self._sock, _ =3D self._sock.accept() - self._sockfile =3D self._sock.makefile() + self._sockfile =3D self._sock.makefile(mode=3D'r') =20 def cmd(self, qtest_cmd): """ @@ -76,6 +77,7 @@ def cmd(self, qtest_cmd): =20 @param qtest_cmd: qtest command text to be sent """ + assert self._sockfile is not None self._sock.sendall((qtest_cmd + "\n").encode('utf-8')) resp =3D self._sockfile.readline() return resp @@ -83,7 +85,9 @@ def cmd(self, qtest_cmd): def close(self): """Close this socket.""" self._sock.close() - self._sockfile.close() + if self._sockfile: + self._sockfile.close() + self._sockfile =3D None =20 def settimeout(self, timeout): """Set a timeout, in seconds.""" --=20 2.21.1