tests: fix unicode issues

Author: pyroscope

src/pyrobase/testing.py

@@ -22,9 +22,9 @@
 from contextlib import contextmanager
 
 try:
-    from io import StringIO
-except ImportError:
     from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 try:
     import mock

src/tests/test_bencode.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-from __future__ import with_statement
+from __future__ import absolute_import, print_function  #, unicode_literals
 
 import logging
 import unittest

src/tests/test_fmt.py

@@ -16,6 +16,8 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
+from __future__ import absolute_import, print_function, unicode_literals
+
 import time
 import logging
 import unittest
@@ -92,13 +94,13 @@ def test_to_unicode(self):
             (u"", u""),
             (False, False),
             (None, None),
-            ("\xc3\xaa", u"\xea"),
-            ("\x80", u"\u20ac"),
-            ("\x81", "\x81"),
-            ("\x8d", "\x8d"),
-            ("\x8f", "\x8f"),
-            ("\x90", "\x90"),
-            ("\x9d", "\x9d"),
+            (b"\xc3\xaa", u"\xea"),
+            (b"\x80", u"\u20ac"),
+            (b"\x81", b"\x81"),
+            (b"\x8d", b"\x8d"),
+            (b"\x8f", b"\x8f"),
+            (b"\x90", b"\x90"),
+            (b"\x9d", b"\x9d"),
         ]
         for val, expected in cases:
             result = fmt.to_unicode(val)
@@ -110,9 +112,9 @@ def test_to_utf8(self):
             (u"", u""),
             (False, False),
             (None, None),
-            (u"\xea", "\xc3\xaa",),
-            (u"\u20ac", "\xe2\x82\xac"),
-            ("\xc3\xaa", "\xc3\xaa"),
+            (u"\xea", b"\xc3\xaa",),
+            (u"\u20ac", b"\xe2\x82\xac"),
+            (b"\xc3\xaa", b"\xc3\xaa"),
             (b"\xfe\xff\x00\x20", u" "),
             (b"\xff\xfe\x20\x00", u" "),
             (b"\xef\xbb\xbf\x20", u" "),
@@ -128,7 +130,7 @@ def test_to_console(self):
             (u"", b""),
             (u"\xea", b"\xc3\xaa",),
             (u"\u20ac", b"\xe2\x82\xac"),
-            ("\xc3\xaa", b"\xc3\xaa"),
+            (b"\xc3\xaa", b"\xc3\xaa"),
             (b"\xfe\xff\x00\x20", b"\xfe\xff\x00\x20"),
             (b"\xef\xbb\xbf\x20", b"\xef\xbb\xbf\x20"),
             (b"\xc3\xc3\x81", b"\xc3\xc3\x81"),

src/tests/test_iterutil.py

@@ -16,6 +16,8 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
+from __future__ import absolute_import, print_function, unicode_literals
+
 import logging
 import unittest
 
@@ -31,7 +33,7 @@ def test_flatten(self):
         def yielding():
             yield 1
             yield (2, "3")
-            
+
         cases = [
             ([],                []),
             ((1, "2"),          [1, "2"]),
@@ -41,4 +43,3 @@ def yielding():
         for val, expected in cases:
             result = list(iterutil.flatten(val))
             assert result == expected
-

src/tests/test_osutil.py

@@ -16,6 +16,8 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
+from __future__ import absolute_import, print_function, unicode_literals
+
 import unittest
 
 from pyrobase import osutil

src/tests/test_parts.py

@@ -16,6 +16,8 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
+from __future__ import absolute_import, print_function, unicode_literals
+
 import logging
 import unittest
 

src/tests/test_xmlrpc2scgi.py

@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from __future__ import absolute_import, print_function, unicode_literals
+
 import time
 import socket
 import logging