r7243 - branches/1.5/turbogears/identity

[svn-c...@turbogears.org]

Author: chrisz
Date: Tue Mar 8 05:09:05 2011
New Revision: 7243
URL: http://trac.turbogears.org/changeset/7243

Log:
CherryPy 3 tools and logging use a "login" request
attribute instead of "user_name" for the user name.

Modified:
branches/1.5/turbogears/identity/base.py

Modified: branches/1.5/turbogears/identity/base.py
==============================================================================
--- branches/1.5/turbogears/identity/base.py Tue Mar 8 04:58:48 2011 (r7242)
+++ branches/1.5/turbogears/identity/base.py Tue Mar 8 05:09:05 2011 (r7243)
@@ -73,11 +73,11 @@

def set_current_identity(identity):
cherrypy.request.identity = identity
-
try:
- cherrypy.request.user_name = identity.user_name
+ user_name = identity.user_name
except AttributeError:
- cherrypy.request.user_name = None
+ user_name = None
+ cherrypy.request.login = cherrypy.request.user_name = user_name


def set_current_provider(provider):