Fixes Py3.4 tests

zbigniev · Dec 6, 2016 · 71c3528 · 71c3528
1 parent 10dec7b
commit 71c3528
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/celery/utils/saferepr.py b/celery/utils/saferepr.py
@@ -125,7 +125,7 @@ def _repr_binary_bytes(val):
             ashex = val.hex
         except AttributeError:  # pragma: no cover
             # Python 3.4
-            return val.decode('utf-8', errors='backslashreplace')
+            return val.decode('utf-8', errors='replace')
         else:
             # Python 3.5+
             return ashex()

diff --git a/t/unit/utils/test_saferepr.py b/t/unit/utils/test_saferepr.py
@@ -208,11 +208,17 @@ def test_unicode_bytes__long(self):
     @skip.unless_python3()
     def test_binary_bytes(self):
         val = struct.pack('>QQQ', 12223, 1234, 3123)
-        assert '2fbf' in saferepr(val, maxlen=128)
+        if hasattr(bytes, 'hex'):  # Python 3.5+
+            assert '2fbf' in saferepr(val, maxlen=128)
+        else:  # Python 3.4
+            assert saferepr(val, maxlen=128)
 
     @skip.unless_python3()
     def test_binary_bytes__long(self):
         val = struct.pack('>QQQ', 12223, 1234, 3123) * 1024
         result = saferepr(val, maxlen=128)
-        assert '2fbf' in result
-        assert result.endswith("...'")
+        if hasattr(bytes, 'hex'):  # Python 3.5+
+            assert '2fbf' in result
+            assert result.endswith("...'")
+        else:  # Python 3.4
+            assert result