Changeset 1584

Timestamp:

12/29/06 06:10:40

Author:

lawouach

Message:

Backport fix to get rid of thread_data. This may need to be documented for applications relying on the value being set. Instead they should now use request.user

Files:

• branches/cherrypy-2.x/cherrypy/filters/sessionauthenticatefilter.py (modified) (3 diffs)

branches/cherrypy-2.x/cherrypy/filters/sessionauthenticatefilter.py

@@ -28 +28 @@
-    def before_main(self):
-        cherrypy.request.user = None
-        cherrypy.thread_data.user = None
-
-        conf = cherrypy.config.get
@@ -49 +48 @@
-            cherrypy.session[session_key] = None
-            cherrypy.request.user = None
-            cherrypy.thread_data.user = None
-            if login and on_logout:
-                on_logout(login)
@@ -87 +85 @@
-        
-        # Everything is OK: user is logged in
-thread_data
+request
-            username = temp_user or cherrypy.session[session_key]
-            cherrypy.request.user = load_user_by_username(username)
-            cherrypy.thread_data.user = cherrypy.request.user