From a617c4db261cd6580ffa59fe3356405af8d6696b Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Fri, 18 Oct 2013 14:06:57 +0200
Subject: [PATCH] Fix authentication with Python 3 (see #70)

---
 radicale/__init__.py | 3 +--
 tests/__init__.py    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/radicale/__init__.py b/radicale/__init__.py
index 41bab4f..3c70ab6 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -271,8 +271,7 @@ class Application(object):
         authorization = environ.get("HTTP_AUTHORIZATION", None)
 
         if authorization:
-            authorization = \
-                authorization.decode("ascii").lstrip("Basic").strip()
+            authorization = authorization.lstrip("Basic").strip()
             user, password = self.decode(base64.b64decode(
                 authorization.encode("ascii")), environ).split(":", 1)
         else:
diff --git a/tests/__init__.py b/tests/__init__.py
index 59ec2af..26a5ad4 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -136,7 +136,7 @@ class HtpasswdAuthSystem(BaseTest):
             fd.write(b"tmp:{SHA}" + base64.b64encode(
                 hashlib.sha1(b"bepo").digest()))
         config.set("auth", "type", "htpasswd")
-        self.userpass = base64.b64encode(b"tmp:bepo")
+        self.userpass = "dG1wOmJlcG8="
         self.application = radicale.Application()
         htpasswd.FILENAME = htpasswd_file_path
         htpasswd.ENCRYPTION = "sha1"