[Lxml-checkins] r54970 - in lxml/trunk: . src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Tue May 20 00:00:45 2008
New Revision: 54970

Modified:
   lxml/trunk/   (props changed)
   lxml/trunk/src/lxml/tests/common_imports.py
Log:
 r4228 at delle:  sbehnel | 2008-05-19 09:30:39 +0200
 initial Py3 test fixes


Modified: lxml/trunk/src/lxml/tests/common_imports.py
==============================================================================
--- lxml/trunk/src/lxml/tests/common_imports.py	(original)
+++ lxml/trunk/src/lxml/tests/common_imports.py	Tue May 20 00:00:45 2008
@@ -1,6 +1,5 @@
 import unittest
 import os.path
-from StringIO import StringIO
 import re, gc
 
 from lxml import etree
@@ -58,6 +57,27 @@
         seq.sort(**kwargs)
         return seq
 
+try:
+    unicode
+except NameError:
+    # Python 3
+    unicode = str
+    def unicode_literal(s, encoding="UTF-8"):
+        return s
+    def byte_literal(s, encoding="UTF-8"):
+        return s.encode(encoding)
+else:
+    # Python 2
+    unicode_literal = unicode
+    def byte_literal(s, encoding="UTF-8"):
+        return s
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    # Python 3
+    from io import StringIO
+
 class HelperTestCase(unittest.TestCase):
     def tearDown(self):
         gc.collect()