Changeset 1596

Timestamp:

01/11/07 16:45:48

Author:

fumanchu

Message:

Fix for #640 (cherrypy.session does not implement __contains__).

Files:

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

trunk/cherrypy/__init__.py

@@ -86 +86 @@
-    def __delitem__(self, key):
-        del self._get_child()[key]
+    
+    def __contains__(self, key):
+        return key in self._get_child()
-
-

trunk/cherrypy/test/test_session.py

@@ -45 +45 @@
-            return str(c)
-        index.exposed = True
+        
+        def keyin(self, key):
+            return str(key in cherrypy.session)
+        keyin.exposed = True
-        
-        def delete(self):
@@ -97 +101 @@
-        self.getPage('/')
-        self.assertBody('1')
+        
+        # Test session __contains__
+        self.getPage('/keyin?key=counter', self.cookies)
+        self.assertBody("True")
-        
-        # Test session delete