Merge pull request StreetVoice#5 from vinta/master

tzangms · tzangms · commit dec96e08de72 · 2015-08-04T15:02:43.000+08:00
Python 3 support
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 
 python:
   - "2.7"
+  - "3.4"
 
 install:
   - pip install coveralls
diff --git a/dj_elastictranscoder/tests.py b/dj_elastictranscoder/tests.py
@@ -71,7 +71,7 @@ def test_onprogress(self):
 
         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')
 
         job = EncodeJob.objects.get(id=self.job_id)
         self.assertEqual(job.state, 1)
@@ -82,7 +82,7 @@ def test_onerror(self):
 
         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')
 
         job = EncodeJob.objects.get(id=self.job_id)
         self.assertEqual(job.state, 2)
@@ -94,7 +94,7 @@ def test_oncomplete(self):
 
         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')
 
         job = EncodeJob.objects.get(id=self.job_id)
         self.assertEqual(job.state, 4)
diff --git 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')
 
diff --git a/setup.py b/setup.py
@@ -15,8 +15,8 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    install_requires = [
-        "django >= 1.4",
+    install_requires=[
+        "django >= 1.4, < 1.7",
         "boto >= 2.5",
         "South >= 0.8",
     ],
@@ -25,6 +25,9 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Environment :: Web Environment",
         "Framework :: Django",
