Changeset 1079 for trunk/genshi/input.py

Timestamp:

Nov 12, 2009, 12:36:14 PM (14 years ago)

Author:

cmlenz

Message:

Add a couple of fallback imports for Python 3.0.

File:

• trunk/genshi/input.py (modified) (7 diffs)

trunk/genshi/input.py

@@ -17 +17 @@
 
 from itertools import chain
+try:
+    import htmlentitydefs as entities
+    import HTMLParser as html
+except ImportError:
+    from html import entities
+    from html import parser as html
+try:
+    from StringIO import StringIO
+    BytesIO = StringIO
+except ImportError:
+    from io import BytesIO, StringIO
 from xml.parsers import expat
-import HTMLParser as html
-import htmlentitydefs
-from StringIO import StringIO
 
 from genshi.core import Attrs, QName, Stream, stripentities
@@ -89 +97 @@
 
     _entitydefs = ['<!ENTITY %s "&#%d;">' % (name, value) for name, value in
-                   htmlentitydefs.name2codepoint.items()]
+                   entities.name2codepoint.items()]
     _external_dtd = '\n'.join(_entitydefs)
 
@@ -170 +178 @@
     def _build_foreign(self, context, base, sysid, pubid):
         parser = self.expat.ExternalEntityParserCreate(context)
-        parser.ParseFile(StringIO(self._external_dtd))
+        parser.ParseFile(BytesIO(self._external_dtd))
         return 1
 
@@ -238 +246 @@
             # deal with undefined entities
             try:
-                text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
+                text = unichr(entities.name2codepoint[text[1:-1]])
                 self._enqueue(TEXT, text)
             except KeyError:
@@ -268 +276 @@
     :raises ParseError: if the XML text is not well-formed
     """
-    return Stream(list(XMLParser(StringIO(text))))
+    return Stream(list(XMLParser(BytesIO(text))))
 
 
@@ -388 +396 @@
     def handle_entityref(self, name):
         try:
-            text = unichr(htmlentitydefs.name2codepoint[name])
+            text = unichr(entities.name2codepoint[name])
         except KeyError:
             text = '&%s;' % name
@@ -422 +430 @@
                         fails
     """
-    return Stream(list(HTMLParser(StringIO(text), encoding=encoding)))
+    return Stream(list(HTMLParser(BytesIO(text), encoding=encoding)))
 
 def _coalesce(stream):