From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 16 Mar 2018 17:49:58 +0000 (-0400)
Subject: apibuild: Fix -refs.xml building
X-Git-Tag: v4.2.0-rc1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e39a7cd2561528964ed2088884edbc1bc8615506;p=thirdparty%2Flibvirt.git

apibuild: Fix -refs.xml building

Another usage of deprecated 'string' functions. We are just trying to
match ascii letters here, so use a simple regex. And again drop the
aggressive exception handling, it doesn't seem to trigger for anything
in libvirt code.

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

diff --git a/docs/apibuild.py b/docs/apibuild.py
index e81980e3c3..51abf83832 100755
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -11,7 +11,6 @@
 from __future__ import print_function
 
 import os, sys
-import string
 import glob
 import re
 
@@ -2092,23 +2091,20 @@ class docBuilder:
         str = str.replace(';', ' ')
         tokens = str.split()
         for token in tokens:
-            try:
-                c = token[0]
-                if string.letters.find(c) < 0:
-                    pass
-                elif len(token) < 3:
+            c = token[0]
+            if not re.match(r"[a-zA-Z]", c):
+                pass
+            elif len(token) < 3:
+                pass
+            else:
+                lower = token.lower()
+                # TODO: generalize this a bit
+                if lower == 'and' or lower == 'the':
                     pass
+                elif token in self.xref:
+                    self.xref[token].append(id)
                 else:
-                    lower = string.lower(token)
-                    # TODO: generalize this a bit
-                    if lower == 'and' or lower == 'the':
-                        pass
-                    elif token in self.xref:
-                        self.xref[token].append(id)
-                    else:
-                        self.xref[token] = [id]
-            except:
-                pass
+                    self.xref[token] = [id]
 
     def analyze(self):
         if not quiet: