Changeset 2021

Timestamp:

07/16/08 13:58:10

Author:

fumanchu

Message:

Fix for #840 (File-based sessions storage path is not stored as an absolute path). The unsafe instance kwargs in Session.__init__ were overriding the safe cls kwargs provided in FileSession?.setup().

Files:

• trunk/cherrypy/lib/sessions.py (modified) (2 diffs)

trunk/cherrypy/lib/sessions.py

@@ -283 +283 @@
-    LOCK_SUFFIX = '.lock'
-    
+    def __init__(self, id=None, **kwargs):
+        # The 'storage_path' arg is required for file-based sessions.
+        kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
+        Session.__init__(self, id=id, **kwargs)
+    
-    def setup(cls, **kwargs):
-        """Set up the storage system for file-based sessions.
@@ -289 +294 @@
-        automatically when using sessions.init (as the built-in Tool does).
-        """
-if 'storage_path' in kwargs:
-    
+# The 'storage_path' arg is required for file-based sessions.
+
-        
-        for k, v in kwargs.iteritems():