From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 2 Oct 2009 15:20:47 +0000 (-0400)
Subject: python: Remove use of xmllib in generator.py
X-Git-Tag: v0.7.2~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fca27ca2bb711b7b9e1334d33e66107abbf7d93d;p=thirdparty%2Flibvirt.git

python: Remove use of xmllib in generator.py

xmllib has been deprecated since python 2.0, and running the generator throws
a warning. Move to using xml.sax

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

diff --git a/python/generator.py b/python/generator.py
index 3d142e9c1d..9ec91d8e83 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -25,32 +25,27 @@ else:
 #
 #######################################################################
 import os
-import xmllib
+import xml.sax
 
 debug = 0
 
-class SlowParser(xmllib.XMLParser):
-    """slow but safe standard parser, based on the XML parser in
-       Python's standard library."""
-
-    def __init__(self, target):
-        self.unknown_starttag = target.start
-        self.handle_data = target.data
-        self.handle_cdata = target.cdata
-        self.unknown_endtag = target.end
-        xmllib.XMLParser.__init__(self)
-
 def getparser():
     # Attach parser to an unmarshalling object. return both objects.
     target = docParser()
-    return SlowParser(target), target
+    parser = xml.sax.make_parser()
+    parser.setContentHandler(target)
+    return parser, target
 
-class docParser:
+class docParser(xml.sax.handler.ContentHandler):
     def __init__(self):
         self._methodname = None
         self._data = []
         self.in_function = 0
 
+        self.startElement = self.start
+        self.endElement = self.end
+        self.characters = self.data
+
     def close(self):
         if debug:
             print "close"