From a9030688e0953ef0598d0209cd94dddd3a66c824 Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Sun, 18 Mar 2012 19:59:08 +0100
Subject: [PATCH] Portable base64 {en,de}coding of basic auth header.

---
 repoze/who/plugins/tests/test_basicauth.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/repoze/who/plugins/tests/test_basicauth.py b/repoze/who/plugins/tests/test_basicauth.py
index 2a15827..e21d411 100644
--- a/repoze/who/plugins/tests/test_basicauth.py
+++ b/repoze/who/plugins/tests/test_basicauth.py
@@ -35,7 +35,7 @@
         items = []
         for item in app_iter:
             items.append(item)
-        response = ''.join(items)
+        response = b''.join(items).decode('utf-8')
         self.failUnless(response.startswith('401 Unauthorized'))
         
     def test_identify_noauthinfo(self):
@@ -57,15 +57,17 @@
         self.assertEqual(creds, None)
 
     def test_identify_basic_badrepr(self):
+        from repoze.who._compat import encodebytes
         plugin = self._makeOne('realm')
-        value = 'foo'.encode('base64')
+        value = encodebytes(b'foo').decode('ascii')
         environ = self._makeEnviron({'HTTP_AUTHORIZATION':'Basic %s' % value})
         creds = plugin.identify(environ)
         self.assertEqual(creds, None)
 
     def test_identify_basic_ok(self):
+        from repoze.who._compat import encodebytes
         plugin = self._makeOne('realm')
-        value = 'foo:bar'.encode('base64')
+        value = encodebytes(b'foo:bar').decode('ascii')
         environ = self._makeEnviron({'HTTP_AUTHORIZATION':'Basic %s' % value})
         creds = plugin.identify(environ)
         self.assertEqual(creds, {'login':'foo', 'password':'bar'})

--
Gitblit v1.9.3