From 24b037c307fecfb0fa895274822bb524dfb3c648 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 9 Dec 2012 14:29:37 -0600 Subject: [PATCH] fixed problem with clear and session_hash --- VERSION | 2 +- gluon/globals.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index bd0eac27..2a2ecc46 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.3.0 (2012-12-08 18:30:53) rc1 +Version 2.3.0 (2012-12-09 14:28:45) rc1 diff --git a/gluon/globals.py b/gluon/globals.py index 1c6dc04d..f6eeaa91 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -660,6 +660,12 @@ class Session(Storage): if self.flash: (response.flash, self.flash) = (self.flash, None) + def clear(self): + previous_session_hash = self.pop('_session_hash', None) + Storage.clear(self) + if previous_session_hash: + self._session_hash = previous_session_hash + def is_new(self): if self._start_timestamp: return False @@ -745,11 +751,9 @@ class Session(Storage): def _try_store_in_file(self, request, response): if response.session_storage_type != 'file': return False - try: if not response.session_id or self._forget or self._unchanged(): return False - if response.session_new or not response.session_file: # Tests if the session sub-folder exists, if not, create it session_folder = os.path.dirname(response.session_filename)