Changeset 1287

Timestamp:

08/26/06 21:12:23

Author:

fumanchu

Message:

Fix for #525 (Support Deleting Sessions).

Files:

• trunk/cherrypy/lib/sessions.py (modified) (6 diffs)
• trunk/cherrypy/test/test_session.py (modified) (4 diffs)

trunk/cherrypy/lib/sessions.py

@@ -118 +118 @@
-            t.start()
-    
+    def delete(self):
+        """Delete stored session data."""
+        self._delete()
+    
-    def __getitem__(self, key):
-        if not self.loaded: self.load()
@@ -188 +192 @@
-    def _save(self, expiration_time):
-        self.cache[self.id] = (self._data, expiration_time)
+    
+    def _delete(self):
+        del self.cache[self.id]
-    
-    def acquire_lock(self):
@@ -225 +232 @@
-        finally:
-            f.close()
+    
+    def _delete(self):
+        os.unlink(self._get_file_path())
-    
-    def acquire_lock(self, path=None):
@@ -304 +314 @@
-    
-    def _save(self, expiration_time):
+        pickled_data = pickle.dumps(self._data)
+        self.cursor.execute('update session set data = %s, '
+                            'expiration_time = %s where id = %s',
+                            (pickled_data, expiration_time, self.id))
+    
+    def _delete(self):
-        self.cursor.execute('delete from session where id=%s', (self.id,))
-
-
-
-
-
+
-    def acquire_lock(self):
-        # We use the "for update" clause to lock the row
+        self.locked = True
-        self.cursor.execute('select id from session where id=%s for update',
-                            (self.id,))
@@ -319 +332 @@
-        #   introduced by the "for update" clause
-        self.cursor.close()
+        self.locked = False
-    
-    def clean_up(self):
@@ -403 +417 @@
-        cookie[name]['secure'] = 1
-
+def expire():
+    """Expire the current session cookie."""
+    name = cherrypy.request.config.get('tools.sessions.name', 'session_id')
+    one_year = 60 * 60 * 24 * 365
+    exp = time.gmtime(time.time() - one_year)
+    t = time.strftime("%a, %d-%b-%Y %H:%M:%S GMT", exp)
+    cherrypy.response.simple_cookie[name]['expires'] = t
+

trunk/cherrypy/test/test_session.py

@@ -9 +9 @@
-
-import cherrypy
+from cherrypy.lib import sessions
-
-
@@ -44 +45 @@
-            return str(c)
-        index.exposed = True
+        
+        def delete(self):
+            cherrypy.session.delete()
+            sessions.expire()
+            return "done"
+        delete.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -59 +66 @@
-        self.getPage('/testStr', self.cookies)
-        self.assertBody('3')
+        
-        self.getPage('/setsessiontype/file')
-        self.getPage('/testStr')
@@ -72 +80 @@
-        self.assertBody('1')
-        
-
+
+
+
+
+
+
+
+
-        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')]
-        self.assertNotEqual(f(), [])