Fix the basic_auth behavior

Rémy HUBSCHER · djc · commit 8336362eda12 · 2014-11-01T10:00:59.000+01:00
HTTP header should be in binary rather than strings.
diff --git a/couchdb/http.py b/couchdb/http.py
@@ -563,13 +563,13 @@ def extract_credentials(url):
 def basic_auth(credentials):
     """Generates authorization header value for given credentials.
     >>> basic_auth(('root', 'relax'))
-    u'Basic cm9vdDpyZWxheA=='
+    b'Basic cm9vdDpyZWxheA=='
     >>> basic_auth(None)
     >>> basic_auth(())
     """
     if credentials:
         token = b64encode(('%s:%s' % credentials).encode('latin1'))
-        return 'Basic %s' % (token.strip().decode('latin1'))
+        return ('Basic %s' % token.strip().decode('latin1')).encode('ascii')
 
 
 def quote(string, safe=''):
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -130,6 +130,12 @@ def test_235_unicode_server(self):
         finally:
             server.delete(dbname)
 
+    def test_basic_auth(self):
+        url = "http://root:password@localhost:5984/"
+        server = client.Server(url)
+        dbname = 'couchdb-python/test_basic_auth'
+        self.assertRaises(http.Unauthorized, server.create, dbname)
+
 
 class DatabaseTestCase(testutil.TempDatabaseMixin, unittest.TestCase):
 
diff --git a/couchdb/tests/testutil.py b/couchdb/tests/testutil.py
@@ -18,6 +18,9 @@ def check_output(self, want, got, optionflags):
         if sys.version_info[0] > 2:
             want = re.sub("u'(.*?)'", "'\\1'", want)
             want = re.sub('u"(.*?)"', '"\\1"', want)
+        else:
+            want = re.sub("b'(.*?)'", "'\\1'", want)
+            want = re.sub('b"(.*?)"', '"\\1"', want)
         return doctest.OutputChecker.check_output(self, want, got, optionflags)
 
 def doctest_suite(mod):
