From nobody Sun Nov 16 16:46:01 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=1600815190; cv=none; d=zohomail.com; s=zohoarc; b=T3F4WKMuoJ/8s3N6jCXbWVA0xgtQ5eb8wXbQV/qSEnqdQt2pMGFvkMk7EO3uMGYkru8eRZUkhyjToBY2mtZKB2UBHb3b9mUK3Ks/xPoduDxyOBRxUUjoMs0kln1K36OxIuZYzpOtPQNI99C8Y1ZqyPUMmkFKVOqezmCUBHEGBUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600815190; 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=J58kk9KonAS7Kge2Gue/KficmECzeBFNtMpPf9StRKk=; b=NxTHhokpT/tB3dp7odwbVYly7MoSAUoJ0UfmfW5I4/l2BwS43XZJldSP1wr/lJN/vjT8sg9CN4QI6NCDl4z1Y8DBIgPaApj2g3y71cJnqPDsZspL/63+ZPFkaAEq/AOSibJdU5ubB6QODqIbGBUapEPdEeZ5uOAV/MJlLfXFF/s= 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 1600815190455394.91469109743423; Tue, 22 Sep 2020 15:53:10 -0700 (PDT) Received: from localhost ([::1]:41338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKr9n-0004VF-5N for importer@patchew.org; Tue, 22 Sep 2020 18:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKqtE-00056o-OY for qemu-devel@nongnu.org; Tue, 22 Sep 2020 18:36:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKqtC-0007lX-Pb for qemu-devel@nongnu.org; Tue, 22 Sep 2020 18:36:00 -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-377-F9Ea86SHNA-hTURJuKKVDg-1; Tue, 22 Sep 2020 18:35:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46FD581CAFB; Tue, 22 Sep 2020 22:35:54 +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 21B9160BF4; Tue, 22 Sep 2020 22:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600814158; 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=J58kk9KonAS7Kge2Gue/KficmECzeBFNtMpPf9StRKk=; b=NYTx7AtLUSCtr6VCUWnM0Flo4hmiJtIY7oeXHdtkToJezBjai94dsVHW7+ZRVQiwI5BWbg mZIbwoDk4L9RRmksuLVsVz/qf3rN6Lu0qsdEb1YvRMBJIeRCuwQrjxo4Ewrvy00xX8lKnE M9ZkwWjqp7VqSkXetAUAUQrfaju3oNk= X-MC-Unique: F9Ea86SHNA-hTURJuKKVDg-1 From: John Snow To: Markus Armbruster Subject: [PATCH 24/26] qapi/parser.py: remove one and two-letter variables Date: Tue, 22 Sep 2020 18:35:23 -0400 Message-Id: <20200922223525.4085762-25-jsnow@redhat.com> In-Reply-To: <20200922223525.4085762-1-jsnow@redhat.com> References: <20200922223525.4085762-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/22 15:47:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, 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: Cleber Rosa , John Snow , qemu-devel@nongnu.org, Eduardo Habkost , Michael Roth 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" Standard pylint complaint: use more descriptibe variable names. OK, fine. Signed-off-by: John Snow --- scripts/qapi/parser.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index cdb64ffc22..818f8bc580 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -57,8 +57,8 @@ class QAPIParseError(QAPISourceError): @classmethod def make(cls: Type[T], parser: 'QAPISchemaParser', msg: str) -> T: col =3D 1 - for ch in parser.src[parser.line_pos:parser.pos]: - if ch =3D=3D '\t': + for char in parser.src[parser.line_pos:parser.pos]: + if char =3D=3D '\t': col =3D (col + 7) % 8 + 1 else: col +=3D 1 @@ -100,14 +100,16 @@ def __init__(self, fname: str, try: with open(self._fname, 'r', encoding=3D'utf-8') as fp: self.src =3D fp.read() - except IOError as e: + except IOError as err: msg =3D "can't read {kind:s} file '{fname:s}': {errmsg:s}".for= mat( kind=3D'include' if parent else 'schema', fname=3Dself._fname, - errmsg=3De.strerror + errmsg=3Derr.strerror ) context =3D parent_info if parent_info else self.info - raise QAPIParseError(context, msg) from e + raise QAPIParseError(context, msg) from err + + # Showtime! self._parse() =20 def _parse(self) -> None: @@ -245,25 +247,25 @@ def accept(self, skip_comment: bool =3D True) -> None: string =3D '' esc =3D False while True: - ch =3D self.src[self.cursor] + char =3D self.src[self.cursor] self.cursor +=3D 1 - if ch =3D=3D '\n': + if char =3D=3D '\n': raise self._parse_error("missing terminating \"'\"= ") if esc: # Note: we recognize only \\ because we have # no use for funny characters in strings - if ch !=3D '\\': - raise self._parse_error(f"unknown escape \\{ch= }") + if char !=3D '\\': + raise self._parse_error(f"unknown escape \\{ch= ar}") esc =3D False - elif ch =3D=3D '\\': + elif char =3D=3D '\\': esc =3D True continue - elif ch =3D=3D "'": + elif char =3D=3D "'": self.val =3D string return - if ord(ch) < 32 or ord(ch) >=3D 127: + if ord(char) < 32 or ord(char) >=3D 127: raise self._parse_error("funny character in string= ") - string +=3D ch + string +=3D char elif self.src.startswith('true', self.pos): self.val =3D True self.cursor +=3D 3 --=20 2.26.2