From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B43D8C41604 for ; Wed, 7 Oct 2020 16:42:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 166BF2087D for ; Wed, 7 Oct 2020 16:42:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BDNvqyRh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 166BF2087D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQCWl-0008Qg-Rp for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 12:42:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQCGS-00060r-Cm for qemu-devel@nongnu.org; Wed, 07 Oct 2020 12:26:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQCGG-00064N-SV for qemu-devel@nongnu.org; Wed, 07 Oct 2020 12:26:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602087951; 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=iAj7bVhrtVmn9T9FSpiiZ4mOeSjuPf13CgdCgN3xkZc=; b=BDNvqyRhtbpCZzY1Hc1xBwmlrxq9+Hokd+aho4Y/IMmb5O0v7ePwYcY5xl6hExUJWkWVHn LlXVY5fc9wM1mZzvYeyWOhKGNe4YYWgeFGsSRikJitzfaGkq2627Aa9L8ReRKS+4hf3SQG ALeUZBb39K+kymTDTNUsGpRRi7CCQRU= 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-64-exAjpatiNvaoViy3jaaZtA-1; Wed, 07 Oct 2020 12:25:50 -0400 X-MC-Unique: exAjpatiNvaoViy3jaaZtA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 156F710BBEC8 for ; Wed, 7 Oct 2020 16:25:49 +0000 (UTC) Received: from [10.10.120.38] (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 892E019C59; Wed, 7 Oct 2020 16:25:48 +0000 (UTC) Subject: Re: [PATCH v5 30/36] qapi/gen.py: update write() to be more idiomatic To: Markus Armbruster References: <20201005195158.2348217-1-jsnow@redhat.com> <20201005195158.2348217-31-jsnow@redhat.com> <87wo02b4ja.fsf@dusky.pond.sub.org> From: John Snow Message-ID: Date: Wed, 7 Oct 2020 12:25:48 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <87wo02b4ja.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:44:56 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.742, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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: qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/7/20 8:32 AM, Markus Armbruster wrote: > John Snow writes: > >> Make the file handling here just a tiny bit more idiomatic. >> (I realize this is heavily subjective.) >> >> Use exist_ok=True 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 3624162bb77..579ee283297 100644 >> --- a/scripts/qapi/gen.py >> +++ b/scripts/qapi/gen.py >> @@ -14,7 +14,6 @@ >> # See the COPYING file in the top-level directory. >> >> 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 = os.path.join(output_dir, self.fname) >> odir = os.path.dirname(pathname) >> + >> if odir: >> - try: >> - os.makedirs(odir) >> - except os.error as e: >> - if e.errno != errno.EEXIST: >> - raise >> + os.makedirs(odir, exist_ok=True) > > I wouldn't call this part "heavily subjective". When wrote the old > code, exist_ok was still off limits (it's new in 3.2). > It's cool if you agree, I just realize that what people consider idiomatic is subjective unless it's enforcable by a tool. This isn't. "I made this look more like if I wrote it, which caused Dopamine" is a bad commit message. (But more true.) >> + >> + # use os.open for O_CREAT to create and read a non-existant file >> fd = os.open(pathname, os.O_RDWR | os.O_CREAT, 0o666) >> - f = open(fd, 'r+', encoding='utf-8') >> - text = self.get_content() >> - oldtext = f.read(len(text) + 1) >> - if text != oldtext: >> - f.seek(0) >> - f.truncate(0) >> - f.write(text) >> - f.close() >> + with os.fdopen(fd, 'r+', encoding='utf-8') as fp: >> + text = self.get_content() >> + oldtext = fp.read(len(text) + 1) >> + if text != oldtext: >> + fp.seek(0) >> + fp.truncate(0) >> + fp.write(text) >> >> >> def _wrap_ifcond(ifcond: List[str], before: str, after: str) -> str: > > Reviewed-by: Markus Armbruster > Thanks, though :)