From nobody Mon Feb 9 11:30:40 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=1601441560; cv=none; d=zohomail.com; s=zohoarc; b=ITWD7RaayZ2VLPwc1aEdxcVqKhXGnnI47T/bfNLzfjX0e5cPhg9uQVm8VHXovVZehlsUTMCg9ObP/9caSRgSw+eutjw6/oNnSh8jh5JaVsQW346Vl08LPBj5R95lNv2NMAUiuIrmJL1ylsBPs2uCTfneFTZSIfcX90P7OPbpYy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601441559; 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=l3nEyyxVfbYSJ2o1erZIwnve0ez1RWEAbC1JmfuNSug=; b=L05zCyNjml5t1XPBqpA7Dg2GBYJ5rXQ8EqWfPBlY5ZXgz9DLTd/lSbkLcOGisad7WSqMo5NYKt6NMpC37f3L34cLiUY6Z7wTyeAuU1aj5pTWYFrODvwP5uQvHykpYRAbqgLKrOS/DjpYwtPtKA4u90c4nQ5nZ/JRxAx38PeKc+M= 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 1601441559994307.11359308947874; Tue, 29 Sep 2020 21:52:39 -0700 (PDT) Received: from localhost ([::1]:33016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNU6X-0001jS-1a for importer@patchew.org; Wed, 30 Sep 2020 00:52:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNTnn-0001Qj-Aj for qemu-devel@nongnu.org; Wed, 30 Sep 2020 00:33:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNTnk-0000dF-Ej for qemu-devel@nongnu.org; Wed, 30 Sep 2020 00:33:15 -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-327-tQL_N6pLPiKmXN_PZ8Q9oQ-1; Wed, 30 Sep 2020 00:33:08 -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 E500F185A0C3; Wed, 30 Sep 2020 04:33:06 +0000 (UTC) Received: from scv.redhat.com (ovpn-119-140.rdu2.redhat.com [10.10.119.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 843667838A; Wed, 30 Sep 2020 04:33:02 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601440391; 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=l3nEyyxVfbYSJ2o1erZIwnve0ez1RWEAbC1JmfuNSug=; b=Fcq1Oec8MBhZCB9awZz4CHZUkCzWEU35i9y6QdQ0lFp+p7qN1P5g9OcGPl/6sOgfYxGVyP boVP1nODEgFF6CMkqhw4vSLdo64/rX+YexUJfvSGxLTmPzgxypV4G+/sAF1O0LtxK3BU1R KyFIpblndQO6KV23lrzHPn/x9ZXf7xY= X-MC-Unique: tQL_N6pLPiKmXN_PZ8Q9oQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v4 34/46] qapi/gen.py: update write() to be more idiomatic Date: Wed, 30 Sep 2020 00:31:38 -0400 Message-Id: <20200930043150.1454766-35-jsnow@redhat.com> In-Reply-To: <20200930043150.1454766-1-jsnow@redhat.com> References: <20200930043150.1454766-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com 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=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/30 00:26:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Peter Maydell , Thomas Huth , Eduardo Habkost , Markus Armbruster , John Snow , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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" Make the file handling here just a tiny bit more idiomatic. (I realize this is heavily subjective.) Use exist_ok=3DTrue for os.makedirs and remove the exception, use fdopen() to wrap the file descriptor in a File-like object, and use a context manager for managing the file pointer. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost Reviewed-by: Cleber Rosa --- scripts/qapi/gen.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 5694a00062c..2ad96e396e1 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -14,7 +14,6 @@ # See the COPYING file in the top-level directory. =20 from contextlib import contextmanager -import errno import os import re from typing import ( @@ -67,21 +66,19 @@ def write(self, output_dir: str) -> None: return pathname =3D os.path.join(output_dir, self.fname) odir =3D os.path.dirname(pathname) + if odir: - try: - os.makedirs(odir) - except os.error as e: - if e.errno !=3D errno.EEXIST: - raise + os.makedirs(odir, exist_ok=3DTrue) + + # use os.open for O_CREAT to create and read a non-existant file fd =3D os.open(pathname, os.O_RDWR | os.O_CREAT, 0o666) - f =3D open(fd, 'r+', encoding=3D'utf-8') - text =3D self.get_content() - oldtext =3D f.read(len(text) + 1) - if text !=3D oldtext: - f.seek(0) - f.truncate(0) - f.write(text) - f.close() + with os.fdopen(fd, 'r+', encoding=3D'utf-8') as fp: + text =3D self.get_content() + oldtext =3D fp.read(len(text) + 1) + if text !=3D oldtext: + fp.seek(0) + fp.truncate(0) + fp.write(text) =20 =20 def _wrap_ifcond(ifcond: List[str], before: str, after: str) -> str: --=20 2.26.2