CVS: Products/ParsedXML - PrettyPrinter.py:1.2 StrIO.py:1.2

Martijn Faassen <[email protected]> Fri, 17 May 2002 07:22:39 -0400
Newsgroups gmane.comp.web.zope.parsed-xml
Message-ID <[email protected]>
Update of /cvs-repository/Products/ParsedXML
In directory cvs.zope.org:/tmp/cvs-serv25863

Modified Files:
	PrettyPrinter.py StrIO.py 
Log Message:
Got rid of cruft necessary to support Python 1.5.2


=== Products/ParsedXML/PrettyPrinter.py 1.1 => 1.2 ===
 from DOM.Core import Node, XMLNS_NS, XML_NS
 import sys
-from StringIO import StringIO
+from StrIO import StringIO
 
 # an XML printer which:
 #   * can do pretty printing, optionally


=== Products/ParsedXML/StrIO.py 1.1 => 1.2 ===
 
-try:
-    unicode
-except NameError:
-    try:
-        from cStringIO import StringIO
-    except:
-        from StringIO import StringIO
-else:
-    # cStringIO has no support for Unicode strings
-    from StringIO import StringIO
+# Python 2.1 and up is now a requirement, so we don't need to
+# do anything special here
+from StringIO import StringIO