From d439b3995f9572d195a4c054c1e13572ec63fcb6 Mon Sep 17 00:00:00 2001 From: Reed Tomlinson Date: Mon, 27 Apr 2015 15:23:19 -0400 Subject: [PATCH 1/2] Decode request bytes --- dj_elastictranscoder/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dj_elastictranscoder/views.py b/dj_elastictranscoder/views.py index a735e67..9ff0f51 100644 --- a/dj_elastictranscoder/views.py +++ b/dj_elastictranscoder/views.py @@ -18,7 +18,7 @@ def endpoint(request): """ try: - data = json.loads(request.read()) + data = json.loads(request.read().decode('utf-8')) except ValueError: return HttpResponseBadRequest('Invalid JSON') From f01f643e177fb74a13df9448f5c01fc8c79eed17 Mon Sep 17 00:00:00 2001 From: Reed Tomlinson Date: Mon, 27 Apr 2015 16:34:54 -0400 Subject: [PATCH 2/2] Updated tests for python3 --- dj_elastictranscoder/tests.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dj_elastictranscoder/tests.py b/dj_elastictranscoder/tests.py index 5f403f2..cdd8e2f 100644 --- a/dj_elastictranscoder/tests.py +++ b/dj_elastictranscoder/tests.py @@ -70,8 +70,7 @@ def test_onprogress(self): content = f.read() resp = self.client.post('/endpoint/', content, content_type="application/json") - self.assertEqual(resp.status_code, 200) - self.assertEqual(resp.content, 'Done') + self.assertContains(resp, 'Done', status_code=200) job = EncodeJob.objects.get(id=self.job_id) self.assertEqual(job.state, 1) @@ -81,8 +80,7 @@ def test_onerror(self): content = f.read() resp = self.client.post('/endpoint/', content, content_type="application/json") - self.assertEqual(resp.status_code, 200) - self.assertEqual(resp.content, 'Done') + self.assertContains(resp, 'Done', status_code=200) job = EncodeJob.objects.get(id=self.job_id) self.assertEqual(job.state, 2) @@ -93,8 +91,7 @@ def test_oncomplete(self): content = f.read() resp = self.client.post('/endpoint/', content, content_type="application/json") - self.assertEqual(resp.status_code, 200) - self.assertEqual(resp.content, 'Done') + self.assertContains(resp, 'Done', status_code=200) job = EncodeJob.objects.get(id=self.job_id) self.assertEqual(job.state, 4)