Fix the python3 tests.

Rémy HUBSCHER · djc · commit 0c276031df0e · 2014-11-16T09:01:13.000+01:00
diff --git a/couchdb/json.py b/couchdb/json.py
@@ -125,7 +125,12 @@ def _init_cjson():
     def _init_stdlib():
         global _decode, _encode
         json = __import__('json', {}, {})
-        _decode = lambda string, loads=json.loads: loads(string)
+
+        def _decode(string_, loads=json.loads):
+            if isinstance(string_, util.btype):
+                string_ = string_.decode("utf-8")
+            return loads(string_)
+
         _encode = lambda obj, dumps=json.dumps: \
             dumps(obj, allow_nan=False, ensure_ascii=False)
 
diff --git a/couchdb/util2.py b/couchdb/util2.py
@@ -1,10 +1,11 @@
 
 __all__ = [
     'StringIO', 'urlsplit', 'urlunsplit', 'urlquote', 'urlunquote',
-    'urlencode', 'utype', 'ltype', 'strbase', 'funcode', 'urlparse',
+    'urlencode', 'utype', 'btype', 'ltype', 'strbase', 'funcode', 'urlparse',
 ]
 
 utype = unicode
+btype = str
 ltype = long
 strbase = str, bytes, unicode
 
@@ -14,5 +15,6 @@
 from urllib import unquote as urlunquote
 from urllib import urlencode
 
+
 def funcode(fun):
     return fun.func_code
diff --git a/couchdb/util3.py b/couchdb/util3.py
@@ -1,10 +1,11 @@
 
 __all__ = [
     'StringIO', 'urlsplit', 'urlunsplit', 'urlquote', 'urlunquote',
-    'urlencode', 'utype', 'ltype', 'strbase', 'funcode', 'urlparse',
+    'urlencode', 'utype', 'btype', 'ltype', 'strbase', 'funcode', 'urlparse',
 ]
 
 utype = str
+btype = bytes
 ltype = int
 strbase = str, bytes
 
@@ -13,5 +14,6 @@
 from urllib.parse import quote as urlquote
 from urllib.parse import unquote as urlunquote
 
+
 def funcode(fun):
     return fun.__code__
