From nobody Mon Jul 7 04:43:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521528580266570.0834962885218; Mon, 19 Mar 2018 23:49:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91F93C04BD24; Tue, 20 Mar 2018 06:49:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 66C5F5C545; Tue, 20 Mar 2018 06:49:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 954114CA9D; Tue, 20 Mar 2018 06:49:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2K6nZEr019414 for ; Tue, 20 Mar 2018 02:49:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16C8AC5DA7; Tue, 20 Mar 2018 06:49:35 +0000 (UTC) Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E4855C545 for ; Tue, 20 Mar 2018 06:49:35 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4294683F3E for ; Tue, 20 Mar 2018 06:49:34 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t7so1190923wmh.5 for ; Mon, 19 Mar 2018 23:49:34 -0700 (PDT) Received: from rst.Home ([2a02:c7d:692a:c500:1ebc:73f3:5f60:b131]) by smtp.gmail.com with ESMTPSA id g38sm1923269wra.77.2018.03.19.23.49.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Mar 2018 23:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gECFdDxTN9g6JXe367QO+qCh0v0duX7aNpkYL/oSynA=; b=et9M0Fq3SyzLpgJDcOQmWknEwx7GtDarTfI/+BJmhB16YsvmrnYXVQPcXHjVOZqwlo cIiTXey6PW1N+I3Y4nkqbEwXlGp+qQVujFuJtpwmCgGn5m9O/jVky8kOUduzXoxtzmYg V9LhADv4+wb6XCiyFGCnXGilG3+GHieAqbYH5v8hWXz2CKNXh2803T0YdLNnK9+ubjYm IJ8+a4w/H7w+pqcpyH/1SQTc1aoWb/DPsVueumGaa8/fKRmX8q6eM4BETX8RRKgpEcZv 9OHTbE/uunjWVP24GvEuv6ApKG2KqT7PtXJmpG0WpOcC4Y1OuINrdwm/G+rvdxqB6GVD OjWg== 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; bh=gECFdDxTN9g6JXe367QO+qCh0v0duX7aNpkYL/oSynA=; b=oGKGDLegSqVBm5+5EbusOJX/9pPj03cUYN0tNGdRr+/LVT22TYz6xEtablgfAx6bZc j3llrbaVg7Fw+/x8cce8u06uzYDPoFUTlWyqk7F4t0k8XY993xjGcrNGK1+j6LJTr6g2 0guD/0mTVAQvdQ1h0OHpYvuh/ZC7bX6A5r0WY+DhGkDJBSsCSENN/vHaB91F9/8u0chy LaMglSBVQ6GQO79FWyMJV3v1zPv0XKDwrn3n9ThQCGGLLlFF/Xqlhd8fJ5RouRnoWJ9T OhpTLtpy8OG32yICMdnYbJHeDZcsxZRhWO/GLP17t9cbjlyt5gwSsot8sNXZi817sHnX mKlQ== X-Gm-Message-State: AElRT7EsfpVbaFHhIYabGVx50GWir8eV43DRS0Fkc5YByt6SJpmMphfg Bmkgmx2CBE5FQkdgbdf7ShzSao5l X-Google-Smtp-Source: AG47ELvIJ2Gre9evu8hD2nRYJcytj3zWpOhv1Qh7LsyTtTPJM34NmP1j9i0E97w+AsKUrrZxU8ZIVw== X-Received: by 10.28.161.4 with SMTP id k4mr990271wme.132.1521528572684; Mon, 19 Mar 2018 23:49:32 -0700 (PDT) From: Radostin Stoyanov To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 06:48:50 +0000 Message-Id: <20180320064908.17723-8-rstoyanov1@gmail.com> In-Reply-To: <20180320064908.17723-1-rstoyanov1@gmail.com> References: <20180320064908.17723-1-rstoyanov1@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 20 Mar 2018 06:49:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 20 Mar 2018 06:49:34 +0000 (UTC) for IP:'74.125.82.68' DOMAIN:'mail-wm0-f68.google.com' HELO:'mail-wm0-f68.google.com' FROM:'rstoyanov1@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.12 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.68 mail-wm0-f68.google.com 74.125.82.68 mail-wm0-f68.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.27 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Radostin Stoyanov Subject: [libvirt] [PATCHv2 07/25] esx_vi_generator: Simplify get_occurrence_comment X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 20 Mar 2018 06:49:39 +0000 (UTC) X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Reduce the number of if-statements and use a single return. Utilise a dictionary to map between occurrences and values. Signed-off-by: Radostin Stoyanov --- src/esx/esx_vi_generator.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 95521fa1e..df913d891 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -75,16 +75,17 @@ class Member: =20 =20 def get_occurrence_comment(self): - if self.occurrence =3D=3D OCCURRENCE__REQUIRED_ITEM: - return "/* required */" - elif self.occurrence =3D=3D OCCURRENCE__REQUIRED_LIST: - return "/* required, list */" - elif self.occurrence =3D=3D OCCURRENCE__OPTIONAL_ITEM: - return "/* optional */" - elif self.occurrence =3D=3D OCCURRENCE__OPTIONAL_LIST: - return "/* optional, list */" + occurrence_map =3D { + OCCURRENCE__REQUIRED_ITEM: "/* required */", + OCCURRENCE__REQUIRED_LIST: "/* required, list */", + OCCURRENCE__OPTIONAL_ITEM: "/* optional */", + OCCURRENCE__OPTIONAL_LIST: "/* optional, list */" + } + try: + return occurrence_map[self.occurrence] + except KeyError: + raise ValueError("unknown occurrence value '%s'" % self.occurr= ence) =20 - raise ValueError("unknown occurrence value '%s'" % self.occurrence) =20 =20 =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list