Bump dependencies for Python 3.6, patch elastic_panel to fix str/byte…

…s issue
feedhq · Mar 17, 2017 · 7f84dad · 7f84dad
1 parent a9668e3
commit 7f84dad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/requirements.in b/requirements.in
@@ -1,5 +1,5 @@
 bleach==1.5.0
-defusedxml==0.4.1
+defusedxml==0.5.0
 dj-database-url==0.4.2
 Django==1.10.5
 django-floppyforms==1.7.0

diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ appdirs==1.4.3            # via setuptools
 bleach==1.5.0
 click==6.7                # via rq
 contextlib2==0.5.4        # via raven
-defusedxml==0.4.1
+defusedxml==0.5.0
 dj-database-url==0.4.2
 django-classy-tags==0.8.0  # via django-sekizai
 django-floppyforms==1.7.0

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -4,6 +4,7 @@
 
 from django.test import TestCase as BaseTestCase
 from django_webtest import WebTest as BaseWebTest
+from elastic_panel import panel
 from feedhq import es
 from feedhq.utils import get_redis_connection
 from rache import job_key
@@ -12,6 +13,15 @@
 
 TEST_DATA = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
 
+_old_pretty_json = panel._pretty_json
+
+def _pretty_json(data):
+    pretty = _old_pretty_json(data)
+    if isinstance(data, str):
+        data = data.encode()
+    return data
+panel._pretty_json = _pretty_json
+
 
 class BytesIO(BaseBytesIO):
     def read(self, *args, **kwargs):