From nobody Sat Jul 5 16:17:24 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 1521528607752699.6627730870753; Mon, 19 Mar 2018 23:50:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3397EA89C; Tue, 20 Mar 2018 06:50:06 +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 ED5E6424E; Tue, 20 Mar 2018 06:50:05 +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 9CB374CAB1; Tue, 20 Mar 2018 06:50:05 +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 w2K6nYdM019403 for ; Tue, 20 Mar 2018 02:49:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 76E2B5C888; Tue, 20 Mar 2018 06:49:34 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F1255C70F for ; Tue, 20 Mar 2018 06:49:32 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) (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 6B0F5C04AC5C for ; Tue, 20 Mar 2018 06:49:31 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id l16so1273273wmh.3 for ; Mon, 19 Mar 2018 23:49:31 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Mar 2018 23:49:29 -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=jTnjCWOp47Bk4Zrdg6T083NOgQJwYH9zE0U/0sM1rsg=; b=pR5r8Bxq59++oDvOEQOMLfUMgSgxyQbvPGTsz5LTwxY2ev0Nd4MaBHNcHW6FL3Qs78 pKypPcs2x1AWla9y9tWlBwIvFYpqBB3VS/byv7DGu4x0ejXaZ+4I63BuETXJaNTaSemd hwl3Dc/DIoJgKAKyrWz0+sChyJz4b8shuIq7Ynf+cQJ8Z0oMsjwgwezB2Jpuks8rHyLK sgaKLMqzvhFNrN2wjRxuuPZ8kfdZ321fxjad2ae5lHMIJihOKQbx1UiEjOTTeD58krqF JWbaTmo0pHSb8o9b4ZBUrvS/WBfHh2b+VoIo1+TKKBfaK+HsQ2iPvrlko7Hd/vr+JNGv aNzQ== 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=jTnjCWOp47Bk4Zrdg6T083NOgQJwYH9zE0U/0sM1rsg=; b=s4LpCMc4YoIIRLBM90Ux5FvX3hGHsEbDPY2NKYmkVPPhYVpghlkKP9vK9iIZllAEDr PPfavq53zm56Ha12EDe8G/I+NcIP59HJ14GVK7npzF/BTWZ5FAgIX49MRyHafbh9Mnz4 ls/M/KzzWhoW4Ux3Lxroqvidf+DSewnETqdn8TBiQVETl18Zb9O1iUYrOiZf4+CGC5ea +ZfR64K6d84KiWZ2u/5hpdqyMrg0HMB/HVWlr+vnva3f1994KgjFu+F2lO7BkyMfZaWm VaaU7qVGoxCb83rT2f+zX4BGeCQOyzqI5JrmqMZOrQ/78MfUVbsyMy2VSGH+AzsdB6LF 232A== X-Gm-Message-State: AElRT7G0rwz4kykvNaNqflnwlzdT+PU/F3wZ5cHFwUF963nGr+Q36cng /CJMCgD8RT9aZ/wSynLxiID7cAxL X-Google-Smtp-Source: AG47ELus6SPn+yOcpLkINntVQfkLRvdfXQrFnfRkoUQC40RDShBQUASMjEMQFFR5JTM7Fcj7y0LZiQ== X-Received: by 10.28.174.11 with SMTP id x11mr1087316wme.124.1521528569859; Mon, 19 Mar 2018 23:49:29 -0700 (PDT) From: Radostin Stoyanov To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 06:48:48 +0000 Message-Id: <20180320064908.17723-6-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.31]); Tue, 20 Mar 2018 06:49:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 20 Mar 2018 06:49:31 +0000 (UTC) for IP:'74.125.82.66' DOMAIN:'mail-wm0-f66.google.com' HELO:'mail-wm0-f66.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.66 mail-wm0-f66.google.com 74.125.82.66 mail-wm0-f66.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Radostin Stoyanov Subject: [libvirt] [PATCHv2 05/25] esx_vi_generator: Simplify generate_helper_source 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 20 Mar 2018 06:50:06 +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" The generate_helper_source() function returns a formatted string. This could be achieved without the use of a local variable "source" and string concatenation. Signed-off-by: Radostin Stoyanov --- src/esx/esx_vi_generator.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 17ac43cb7..8f581c41e 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1092,26 +1092,19 @@ class ManagedObject(GenericObject): =20 =20 def generate_helper_source(self): - source =3D "" - # lookup - source +=3D "/* esxVI_Lookup%s */\n" % self.name - source +=3D "ESX_VI__TEMPLATE__LOOKUP(%s,\n" % self.name - source +=3D "{\n" - - source +=3D self.generate_lookup_code1() - - source +=3D "},\n" - source +=3D "{\n" - - source +=3D self.generate_lookup_code2() - - source +=3D "})\n\n" - - source +=3D "\n\n" - - return source - + return ( + "/* esxVI_Lookup%(name)s */\n" + "ESX_VI__TEMPLATE__LOOKUP(%(name)s,\n" + "{\n" + "%(lookup_code1)s},\n" + "{\n" + "%(lookup_code2)s})" + "\n\n\n\n" + % {"name": self.name, + "lookup_code1": self.generate_lookup_code1(), + "lookup_code2": self.generate_lookup_code2()} + ) =20 =20 class Enum(Type): --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list