Changeset 1082 for trunk/genshi/input.py

Timestamp:

Nov 12, 2009, 6:01:52 PM (14 years ago)

Author:

cmlenz

Message:

More bits of 2to3 related cleanup.

File:

• trunk/genshi/input.py (modified) (4 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
+import htmlentitydefs as entities
+import HTMLParser as html
+from StringIO import StringIO
 from xml.parsers import expat
 
 from genshi.core import Attrs, QName, Stream, stripentities
-from genshi.core import START, END, XML_DECL, DOCTYPE, TEXT, START_NS, END_NS, \
-                        START_CDATA, END_CDATA, PI, COMMENT
+from genshi.core import START, END, XML_DECL, DOCTYPE, TEXT, START_NS, \
+                        END_NS, START_CDATA, END_CDATA, PI, COMMENT
 
 __all__ = ['ET', 'ParseError', 'XMLParser', 'XML', 'HTMLParser', 'HTML']
 __docformat__ = 'restructuredtext en'
+
 
 def ET(element):
@@ -178 +171 @@
     def _build_foreign(self, context, base, sysid, pubid):
         parser = self.expat.ExternalEntityParserCreate(context)
-        parser.ParseFile(BytesIO(self._external_dtd))
+        parser.ParseFile(StringIO(self._external_dtd))
         return 1
 
@@ -276 +269 @@
     :raises ParseError: if the XML text is not well-formed
     """
-    return Stream(list(XMLParser(BytesIO(text))))
+    return Stream(list(XMLParser(StringIO(text))))
 
 
@@ -430 +423 @@
                         fails
     """
-    return Stream(list(HTMLParser(BytesIO(text), encoding=encoding)))
+    return Stream(list(HTMLParser(StringIO(text), encoding=encoding)))
+
 
 def _coalesce(stream):