From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 16 Mar 2018 17:47:36 +0000 (-0400)
Subject: apibuild: Fix errors on python3
X-Git-Tag: v4.2.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960ff97be304adcc7a497b09a08390f1daeea3c6;p=thirdparty%2Flibvirt.git

apibuild: Fix errors on python3

Module 'string' function lower doesn't exist in python3. The canonical
way is to call .lower() on a str instance. Do that, and make the
exception handling more specific, which would have made this issue
obvious.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/docs/apibuild.py b/docs/apibuild.py
index 67b7eed1e6..e81980e3c3 100755
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -2326,10 +2326,10 @@ class docBuilder:
             for data in ('Summary', 'Description', 'Author'):
                 try:
                     output.write("     <%s>%s</%s>\n" % (
-                                 string.lower(data),
+                                 data.lower(),
                                  escape(dict.info[data]),
-                                 string.lower(data)))
-                except:
+                                 data.lower()))
+                except KeyError:
                     self.warning("Header %s lacks a %s description" % (module, data))
             if 'Description' in dict.info:
                 desc = dict.info['Description']