From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 20 Mar 2018 06:48:48 +0000 (+0000)
Subject: esx_vi_generator: Simplify generate_helper_source
X-Git-Tag: v4.2.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68106955da7640b9105e509a9783a4a8a4f02268;p=thirdparty%2Flibvirt.git

esx_vi_generator: Simplify generate_helper_source

The generate_helper_source() function returns a formatted string.
This could be achieved without the use of a local variable "source"
and string concatenation.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---

diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py
index 17ac43cb7c..8f581c41e2 100755
--- a/src/esx/esx_vi_generator.py
+++ b/src/esx/esx_vi_generator.py
@@ -1092,26 +1092,19 @@ class ManagedObject(GenericObject):
 
 
     def generate_helper_source(self):
-        source = ""
-
         # lookup
-        source += "/* esxVI_Lookup%s */\n" % self.name
-        source += "ESX_VI__TEMPLATE__LOOKUP(%s,\n" % self.name
-        source += "{\n"
-
-        source += self.generate_lookup_code1()
-
-        source += "},\n"
-        source += "{\n"
-
-        source += self.generate_lookup_code2()
-
-        source += "})\n\n"
-
-        source += "\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()}
+        )
 
 
 class Enum(Type):