From 07ee180bf7561f7a6330c91b6d4833f55328b8f3 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 23 Sep 2011 00:18:24 -0400
Subject: prevent a syntax error (this is not really correct)

---
 pyramid/authentication.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyramid/authentication.py b/pyramid/authentication.py
index 2bbe4d191..d75549d36 100644
--- a/pyramid/authentication.py
+++ b/pyramid/authentication.py
@@ -9,6 +9,7 @@ import urllib
 from zope.interface import implementer
 
 from pyramid.compat import long
+from pyramid.compat import text_type
 
 from pyramid.interfaces import IAuthenticationPolicy
 from pyramid.interfaces import IDebugLogger
@@ -548,7 +549,7 @@ class AuthTktCookieHelper(object):
     userid_type_encoders = {
         int: ('int', str),
         long: ('int', str),
-        unicode: ('b64unicode', lambda x: b64encode(utf_8_encode(x)[0])),
+        text_type: ('b64unicode', lambda x: b64encode(utf_8_encode(x)[0])),
         str: ('b64str', lambda x: b64encode(x)),
         }
     
-- 
cgit v1.2.3