Changeset 1707

Timestamp:

08/22/07 12:07:53

Author:

fumanchu

Message:

Better fix for #680.

Files:

• branches/cherrypy-3.0.x/cherrypy/lib/sessions.py (modified) (2 diffs)
• branches/cherrypy-3.0.x/cherrypy/test/test_session.py (modified) (3 diffs)

branches/cherrypy-3.0.x/cherrypy/lib/sessions.py

@@ -396 +396 @@
-def save():
-    """Save any changed session data."""
+    
+    if not hasattr(cherrypy._serving, "session"):
+        return
+    
-    # Guard against running twice
-    if hasattr(cherrypy.request, "_sessionsaved"):
@@ -415 +419 @@
-def close():
-    """Close the session object for this request."""
-cherrypy.session
-
+getattr(cherrypy._serving, "session", None)
+ and sess
-        # If the session is still locked we release the lock
-        sess.release_lock()

branches/cherrypy-3.0.x/cherrypy/test/test_session.py

@@ -10 +10 @@
-import cherrypy
-from cherrypy.lib import sessions
+
+def http_methods_allowed(methods=['GET', 'HEAD']):
+    method = cherrypy.request.method.upper()
+    if method not in methods:
+        cherrypy.response.headers['Allow'] = ", ".join(methods)
+        raise cherrypy.HTTPError(405)
+
+cherrypy.tools.allow = cherrypy.Tool('on_start_resource', http_methods_allowed)
-
-
@@ -68 +76 @@
-            raise cherrypy.InternalRedirect('/blah')
-        iredir.exposed = True
+        
+        @cherrypy.tools.allow(methods=['GET'])
+        def restricted(self):
+            return cherrypy.request.method
+        restricted.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -175 +188 @@
-        os.unlink(path)
-        self.getPage('/testStr', self.cookies)
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-