Make sure base URL is non-unicode string on Python 2 (fixes #235)

djc · djc · commit aa58d507579d · 2014-08-01T16:21:00.000+02:00
diff --git a/couchdb/http.py b/couchdb/http.py
@@ -520,6 +520,8 @@ def __del__(self):
 class Resource(object):
 
     def __init__(self, url, session, headers=None):
+        if sys.version_info[0] == 2 and isinstance(url, util.utype):
+            url = url.encode('utf-8') # kind of an ugly hack for issue 235
         self.url, self.credentials = extract_credentials(url)
         if session is None:
             session = Session()
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -10,6 +10,7 @@
 import os
 import os.path
 import shutil
+import sys
 import time
 import tempfile
 import threading
@@ -116,6 +117,20 @@ def test_uuids(self):
         ls = self.server.uuids(count=10)
         assert type(ls) == list and len(ls) == 10
 
+    def test_235_unicode_server(self):
+
+        url = client.DEFAULT_BASE_URL
+        if not isinstance(url, util.utype):
+            url = url.decode('utf-8')
+
+        server = client.Server(url)
+        dbname = 'couchdb-python/test-235-unicode-server'
+        db = server.create(dbname)
+        try:
+            db.update([{'foo': u'\ua000'}])
+        finally:
+            server.delete(dbname)
+
 
 class DatabaseTestCase(testutil.TempDatabaseMixin, unittest.TestCase):
 
