From nobody Tue Feb 10 01:14:54 2026 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=1590943647; cv=none; d=zohomail.com; s=zohoarc; b=GMEspWpV0HFIadORoWEOSR17OQLbwel2T3azmFQrGciW9C+uohFsVKv+3U3XdyO0mfhiPhIViPbE2ZsvQUs8CHPXUCXnPoCKryN5g7ZpRls01u6/1wZ9nYN54MxlIJ0u0S6hCWVsF7n4IlBhBFcDJ8g04lAOvQIQgdnEnaDy9l4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590943647; 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=ZGJCD3WtpxESapRsldRYyPkWs2bF0ehM3T5fdkPvFFk=; b=QTZmBxwpVu9cz7MxezwA3Sup6xK+a08BX1J5AqBOnVnjVPpm5Mj54xDaIppCM9wm2Xma8tOLN6ENkFGcOH71f03RpxD6Ttj5GBRNyaXQO3LLSSt2962Ty7B7ase6Q8zoBcjdPgbKJFCB8yoN/83n2KyoImyknfufqCO/4AhBG80= 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 1590943647176804.572919722433; Sun, 31 May 2020 09:47:27 -0700 (PDT) Received: from localhost ([::1]:47756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfR7N-0005Zm-Kd for importer@patchew.org; Sun, 31 May 2020 12:47:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfR0H-0002dh-D9 for qemu-devel@nongnu.org; Sun, 31 May 2020 12:40:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29260 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 1jfR0D-0006tG-DR for qemu-devel@nongnu.org; Sun, 31 May 2020 12:40:05 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-at6wA1JqMreU_Jt8MehhQw-1; Sun, 31 May 2020 12:39:57 -0400 Received: by mail-wr1-f71.google.com with SMTP id s7so3619086wrm.16 for ; Sun, 31 May 2020 09:39:57 -0700 (PDT) Received: from localhost.localdomain (43.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.43]) by smtp.gmail.com with ESMTPSA id d13sm8387945wmb.39.2020.05.31.09.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 09:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590943200; 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=ZGJCD3WtpxESapRsldRYyPkWs2bF0ehM3T5fdkPvFFk=; b=TSu9kky/5xdS9F+dCqW/bNd8nnphs8gjD2hzz42LaISvch537aUNHyIIewvfI9W8sHSYzk EwggN1GgaNVRu2yKgk0N1eRxRyMI7YVXC4OLIHkOR6II8Hg6iHj/phY+zpJ0n6CVoQZ7jR pIx9cD1wH3LK0eoDwaF3jzgtnV3ySag= X-MC-Unique: at6wA1JqMreU_Jt8MehhQw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZGJCD3WtpxESapRsldRYyPkWs2bF0ehM3T5fdkPvFFk=; b=iVSQq9+C2npHNSNNy/u+s/vNZHESmq80uEmgtwN9PnieXQAEL81UZHMmGrkyEbjJnd Hn6yMVUqevd57wNbyRtDoagzwu8UN9XhD4l+F66cHIP2Bi8CKnnMcSdLpupWjvxe1BIs hyldv8ibKQ2wNwGBixECKJlhflsRgNwp2T/Ekt3deOwbqvsdATLvEu2jldtGDdcWZB6p AkMjiPf3Fy+kmVLPPorfHpoj0+89UFIoZ8NR/N8dmaagm15FikeqIX4vIcp3z9r6Xr+4 FNzJPkhI7QaqQUh2xiIAE41x5W6SKAVP1Aapzw9uReFlaXU6+CnIMOH+YWoC6fJh+7qC SgPw== X-Gm-Message-State: AOAM532It77JBfTr/H/UxRBWoMpP+TTLSSD8CYIZaCegk8W0hjHGK+SG iQhqpbhr5k8R+7Pqv/ShpVmvdDexD5CE5x3EnjZlvrVIJZR711hx5yl0+mhJU/gOPKNn/2PjyhJ 3k3Hk3AozNjvTSD4= X-Received: by 2002:a7b:c201:: with SMTP id x1mr17564255wmi.58.1590943195858; Sun, 31 May 2020 09:39:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOEXwNNL/vFr901ND3jDCNFYuC5Y9R8OiJUy3KhCsCICPZclc2nGHqbOnLRtzqs9ghv2iSEA== X-Received: by 2002:a7b:c201:: with SMTP id x1mr17564238wmi.58.1590943195679; Sun, 31 May 2020 09:39:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/25] python/qemu: fix socket.makefile() typing Date: Sun, 31 May 2020 18:38:34 +0200 Message-Id: <20200531163846.25363-14-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200531163846.25363-1-philmd@redhat.com> References: <20200531163846.25363-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/31 11:09:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_DKIM_INVALID=0.01, 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: Kevin Wolf , Fam Zheng , Eduardo Habkost , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcelo Tosatti , Markus Armbruster , Max Reitz , John Snow , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: John Snow 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 Message-Id: <20200514055403.18902-13-jsnow@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/qmp.py | 10 +++++++--- python/qemu/qtest.py | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py index 6ae7693965..73d49050ed 100644 --- a/python/qemu/qmp.py +++ b/python/qemu/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/qtest.py b/python/qemu/qtest.py index 7943487c2b..4c88590eb0 100644 --- a/python/qemu/qtest.py +++ b/python/qemu/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.3