Hacking up the tests for python 3

theonion · Apr 14, 2014 · 97a18a2 · 97a18a2
1 parent d103dbb
commit 97a18a2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/betty/storage.py b/betty/storage.py
@@ -63,7 +63,6 @@ def _save(self, image_id, content):
 
         r = requests.post(endpoint, data=data, files=files, headers=self.auth_headers)
         if r.status_code != 200:
-            print(r.content)
             raise IOError("Save failed")
 
         return str(r.json()["id"])

diff --git a/tests/test_image_field.py b/tests/test_image_field.py
@@ -18,29 +18,30 @@
 
 TEST_DATA_PATH = os.path.join(os.path.dirname(__file__), 'images')
 
+TEST_IMAGE_DATA = json.dumps({
+    "id": 12345,
+    "name": "Lenna.png",
+    "width": 512,
+    "height": 512,
+    "credit": "Lena Soderberg",
+    "selections": {}
+}).encode("UTF-8")
+
 
 @urlmatch(path=r'.*api/new$')
 def betty_new_mock(url, request):
-    return json.dumps({
-        "id": 12345,
-        "name": "Lenna.png",
-        "width": 512,
-        "height": 512,
-        "credit": "Lena Soderberg",
-        "selections": {}
-    })
+    return {
+        "status_code": 200,
+        "content": TEST_IMAGE_DATA
+    }
 
 
 @urlmatch(path=r'.*api/12345.*$')
 def betty_detail_mock(url, request):
-    return json.dumps({
-        "id": 12345,
-        "name": "Lenna.png",
-        "width": 512,
-        "height": 512,
-        "credit": "Lena Soderberg",
-        "selections": {}
-    })
+    return {
+        "status_code": 200,
+        "content": TEST_IMAGE_DATA
+    }
 
 
 class ImageFieldTestCase(TestCase):