Changeset 1868

Timestamp:

01/17/08 01:59:43

Author:

fumanchu

Message:

Half of the fix for #717 (sessions should have a len function). Not implemented yet for PG, Memcached.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/lib/sessions.py (modified) (2 diffs)
• trunk/cherrypy/test/test_session.py (modified) (6 diffs)
• trunk/cherrypy/test/test_tutorials.py (modified) (1 diff)

trunk/cherrypy/__init__.py

@@ -339 +339 @@
-        child = getattr(serving, self.__attrname__)
-        return key in child
+    
+    def __len__(self):
+        child = getattr(serving, self.__attrname__)
+        return len(child)
-
-

trunk/cherrypy/lib/sessions.py

@@ -263 +263 @@
-        self.locks[self.id].release()
-        self.locked = False
+    
+    def __len__(self):
+        """Return the number of active sessions."""
+        return len(self.cache)
-
-
@@ -372 +376 @@
-                finally:
-                    self.release_lock(path)
+    
+    def __len__(self):
+        """Return the number of active sessions."""
+        return len([fname for fname in os.listdir(self.storage_path)
+                    if (fname.startswith(self.SESSION_PREFIX)
+                        and not fname.endswith(self.LOCK_SUFFIX))])
-
-

trunk/cherrypy/test/test_session.py

@@ -21 +21 @@
-
-def setup_server():
+    
-    class Root:
-        
@@ -29 +30 @@
-                      'tools.sessions.clean_freq': (1.0 / 60),
-                      }
+        
+        def clear(self):
+            cherrypy.session.cache.clear()
+        clear.exposed = True
-        
-        def testGen(self):
@@ -90 +95 @@
-            return "logged in"
-        regen.exposed = True
+        
+        def length(self):
+            return str(len(cherrypy.session))
+        length.exposed = True
-    
-    cherrypy.tree.mount(Root())
@@ -106 +115 @@
-    
-    def test_0_Session(self):
+        self.getPage('/clear')
+        
+        self.getPage('/testStr')
+        self.assertBody('1')
+        self.getPage('/testGen', self.cookies)
+        self.assertBody('2')
+        self.getPage('/testStr', self.cookies)
+        self.assertBody('3')
+        self.getPage('/length', self.cookies)
+        self.assertBody('1')
+        self.getPage('/delkey?key=counter', self.cookies)
+        self.assertStatus(200)
+        
+        self.getPage('/setsessiontype/file')
-        self.getPage('/testStr')
-        self.assertBody('1')
@@ -115 +138 @@
-        self.assertStatus(200)
-        
-        self.getPage('/setsessiontype/file')
-        self.getPage('/testStr')
-        self.assertBody('1')
-        self.getPage('/testGen', self.cookies)
-        self.assertBody('2')
-        self.getPage('/testStr', self.cookies)
-        self.assertBody('3')
-        self.getPage('/delkey?key=counter', self.cookies)
-        self.assertStatus(200)
-        
-        # Wait for the session.timeout (1 second)
-        time.sleep(2)
-        self.getPage('/')
-        self.assertBody('1')
+        self.getPage('/length', self.cookies)
+        self.assertBody('1')
-        
-        # Test session __contains__
-        self.getPage('/keyin?key=counter', self.cookies)
-        self.assertBody("True")
+        cookieset1 = self.cookies
+        
+        # Make a new session and test __len__ again
+        self.getPage('/')
+        self.getPage('/length', self.cookies)
+        self.assertBody('2')
-        
-        # Test session delete
-        self.getPage('/delete', self.cookies)
+        self.assertBody("done")
+        self.getPage('/delete', cookieset1)
-        self.assertBody("done")
-        f = lambda: [x for x in os.listdir(localDir) if x.startswith('session-')]
@@ -173 +196 @@
-            data_dict[index] = v = int(self.body)
-        
-concurrent requests from
-each of <client_thread_count>
+requests from each of
+<client_thread_count> concurrent
-        ts = []
-        for c in xrange(client_thread_count):

trunk/cherrypy/test/test_tutorials.py

@@ -118 +118 @@
-        self.assertBody('Hendrik Mans, CherryPy co-developer & crazy German '
-                        '(<a href="./">back</a>)')
+    
-    def test07Sessions(self):
-        self.getPage("/load_tut_module/tut07_sessions")