Debugging Python3 compatibility. Debugging tests.

rib/thumbnail/pil.py

@@ -26,7 +26,7 @@ def generate(self, filepath):
         filename = os.path.basename(filepath)
         _, extension = os.path.splitext(filename)
 
-        thumbnail_filename = hashlib.sha1(filepath).hexdigest() + extension
+        thumbnail_filename = hashlib.sha1(filepath.encode('utf-8')).hexdigest() + extension
         thumbnail_filepath = os.path.join(self.__path, thumbnail_filename)
 
         if os.path.exists(thumbnail_filepath) is False:

tests/handler/api/thumbnail/test_download.py

@@ -1,6 +1,6 @@
 import os
 import unittest
-import StringIO
+import io
 
 import PIL.Image
 
@@ -21,6 +21,8 @@ def test_get__gnome(self):
         if is_loaded is False:
             raise unittest.SkipTest("Gnome not available.")
 
+        import rib.handler.api.thumbnail.download
+
         with rib.test_support.environment(
                 IMAGE_ROOT_PATH=_ASSETS_PATH,
                 THUMBNAILER_CLASS='rib.thumbnail.gnome.GnomeThumbnailer',
@@ -32,7 +34,7 @@ def test_get__gnome(self):
             self.assertEquals(r.status_code, 200)
             self.assertEquals(r.headers['X-THUMBNAILER'], 'GnomeThumbnailer')
 
-            s = StringIO.StringIO(r.data)
+            s = io.BytesIO(r.data)
             im = PIL.Image.open(s)
             self.assertTrue(im.size[0] <= 128)
             self.assertTrue(im.size[1] <= 128)
@@ -53,7 +55,7 @@ def test_get__pil(self):
                 self.assertEquals(r.status_code, 200)
                 self.assertEquals(r.headers['X-THUMBNAILER'], 'PilThumbnailer')
 
-                s = StringIO.StringIO(r.data)
+                s = io.BytesIO(r.data)
                 im = PIL.Image.open(s)
                 self.assertTrue(im.size[0] <= 128)
                 self.assertTrue(im.size[1] <= 128)

tests/handler/image/test_browse.py

@@ -1,15 +1,32 @@
 import os
 import unittest
-import HTMLParser
 
 import rib.test_support
 
 
-class TestParser(HTMLParser.HTMLParser):
+try:
+    import HTMLParser
+except ImportError:
+    # Python 3
+
+    import html.parser
+
+    class _TestParserBase(html.parser.HTMLParser):
+        def __init__(self, *args, **kwargs):
+            html.parser.HTMLParser.__init__(self, *args, **kwargs)
+else:
+    # Python 2
+
+    class _TestParserBase(HTMLParser.HTMLParser):
+        def __init__(self, *args, **kwargs):
+            HTMLParser.HTMLParser.__init__(self, *args, **kwargs)
+
+
+class TestParser(_TestParserBase):
     def __init__(self, *args, **kwargs):
         self.__images = []
 
-        HTMLParser.HTMLParser.__init__(self, *args, **kwargs)
+        _TestParserBase.__init__(self, *args, **kwargs)
 
     def handle_starttag(self, tag, attrs):
         if tag != 'img':
@@ -49,7 +66,7 @@ def test_get__root(self):
                 self.assertEquals(r.status_code, 200)
 
                 p = TestParser()
-                p.feed(r.data)
+                p.feed(str(r.data))
 
                 expected = [
                     '/api/thumbnail/download?filepath=subdir',
@@ -73,7 +90,7 @@ def test_get__subdirectory(self):
                 self.assertEquals(r.status_code, 200)
 
                 p = TestParser()
-                p.feed(r.data)
+                p.feed(str(r.data))
 
                 expected = [
                     '/api/thumbnail/download?filepath=subdir%2Fimage3.jpg',

tests/handler/system/test_ping.py

@@ -12,7 +12,7 @@ def test_get(self):
 
         self.assertEquals(r.status_code, 200)
 
-        expected = """\
+        expected = b"""\
 {}
 """
 

tests/thumbnail/test_gnome.py

@@ -23,6 +23,8 @@ def test_generate(self):
         image_filepath = \
             os.path.join(_ASSETS_PATH, 'childpath', 'gorillababy.jpg')
 
+        import rib.thumbnail.gnome
+
         gt = rib.thumbnail.gnome.GnomeThumbnailer()
         thumbnail_filepath, thumbnail_mimetype = \
             gt.generate(image_filepath)