generator: Use string formatting

instead of sting concatenating.

Signed-off-by: Philipp Hahn <hahn@univention.de>

1 files changed, 13 insertions, 13 deletions

diff --git a/generator.py b/generator.py
index 909dca5..9404fc3 100755
--- a/generator.py
+++ b/generator.py
@@ -929,9 +929,9 @@ def buildStubs(module, api_xml):
     wrapper = open(wrapper_file, "w")
     wrapper.write("/* Generated by generator.py */\n\n")
     wrapper.write("#include <Python.h>\n")
-    wrapper.write("#include <libvirt/" + module + ".h>\n")
+    wrapper.write("#include <libvirt/%s.h>\n" % (module,))
     wrapper.write("#include \"typewrappers.h\"\n")
-    wrapper.write("#include \"build/" + module + ".h\"\n\n")
+    wrapper.write("#include \"build/%s.h\"\n\n" % (module,))
 
     for function in sorted(funcs):
         # Skip the functions which are not for the module
@@ -1392,7 +1392,7 @@ def buildWrappers(module):
     classes.write("# This file is automatically written by generator.py. Any changes\n")
     classes.write("# made here will be lost.\n")
     classes.write("#\n")
-    classes.write("# To change the manually written methods edit " + module + "-override.py\n")
+    classes.write("# To change the manually written methods edit %s-override.py\n" % (module,))
     classes.write("# To change the automatically written methods edit generator.py\n")
     classes.write("#\n")
     classes.write("# WARNING WARNING WARNING WARNING\n")
@@ -1480,9 +1480,9 @@ def buildWrappers(module):
 
                 elif is_python_noninteger_type(ret[0]):
                     if name not in functions_noexcept:
-                        classes.write(("    if %s is None" +
-                                       ": raise libvirtError ('%s() failed')\n") %
-                                      ("ret", name))
+                        classes.write(
+                            "    if ret is None: raise libvirtError ('%s() failed')\n" %
+                            (name,))
                     classes.write("    return ret\n")
 
                 else:
@@ -1672,7 +1672,7 @@ def buildWrappers(module):
                 classes.write("\n")
             # Append "<classname>.py" to class def, iff it exists
             try:
-                extra = open("libvirt-override-" + classname + ".py", "r")
+                extra = open("libvirt-override-%s.py" % (classname,), "r")
                 classes.write("    #\n")
                 classes.write("    # %s methods from %s.py (hand coded)\n" % (classname, classname))
                 classes.write("    #\n")
@@ -1783,7 +1783,7 @@ def qemuBuildWrappers(module):
     fd.write("# This file is automatically written by generator.py. Any changes\n")
     fd.write("# made here will be lost.\n")
     fd.write("#\n")
-    fd.write("# To change the manually written methods edit " + module + "-override.py\n")
+    fd.write("# To change the manually written methods edit %s-override.py\n" % (module,))
     fd.write("# To change the automatically written methods edit generator.py\n")
     fd.write("#\n")
     fd.write("# WARNING WARNING WARNING WARNING\n")
@@ -1848,9 +1848,9 @@ def qemuBuildWrappers(module):
         fd.write(")\n")
 
         if ret[0] != "void":
-            fd.write("    if ret is None: raise libvirt.libvirtError('" + name + "() failed')\n")
+            fd.write("    if ret is None: raise libvirt.libvirtError('%s() failed')\n" % (name,))
             if ret[0] == "virDomainPtr":
-                fd.write("    __tmp = libvirt.virDomain(" + conn + ", _obj=ret)\n")
+                fd.write("    __tmp = libvirt.virDomain(%s, _obj=ret)\n" % (conn,))
                 fd.write("    return __tmp\n")
             else:
                 fd.write("    return ret\n")
@@ -1889,7 +1889,7 @@ def lxcBuildWrappers(module):
     fd.write("# This file is automatically written by generator.py. Any changes\n")
     fd.write("# made here will be lost.\n")
     fd.write("#\n")
-    fd.write("# To change the manually written methods edit " + module + "-override.py\n")
+    fd.write("# To change the manually written methods edit %s-override.py\n" % (module,))
     fd.write("# To change the automatically written methods edit generator.py\n")
     fd.write("#\n")
     fd.write("# WARNING WARNING WARNING WARNING\n")
@@ -1952,9 +1952,9 @@ def lxcBuildWrappers(module):
         fd.write(")\n")
 
         if ret[0] != "void":
-            fd.write("    if ret is None: raise libvirt.libvirtError('" + name + "() failed')\n")
+            fd.write("    if ret is None: raise libvirt.libvirtError('%s() failed')\n" % (name,))
             if ret[0] == "virDomainPtr":
-                fd.write("    __tmp = libvirt.virDomain(" + conn + ", _obj=ret)\n")
+                fd.write("    __tmp = libvirt.virDomain(%s, _obj=ret)\n" % (conn,))
                 fd.write("    return __tmp\n")
             else:
                 fd.write("    return ret\n")