Changeset 6558

Timestamp:

10/20/07 05:12:59 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4729 -- Restored functionality to the Session class so that popping a
value marks it as modified. This was accidentally lost in the changes in
[6333]. Thanks, hawkeye.

Files:

• django/trunk/django/contrib/sessions/backends/base.py (modified) (1 diff)
• django/trunk/django/contrib/sessions/tests.py (modified) (2 diffs)

django/trunk/django/contrib/sessions/backends/base.py

@@ -49 +49 @@
-
-    def pop(self, key, *args):
+        self.modified = self.modified or key in self._session
-        return self._session.pop(key, *args)
-

django/trunk/django/contrib/sessions/tests.py

@@ -4 +4 @@
->>> from django.contrib.sessions.backends.cache import SessionStore as CacheSession
->>> from django.contrib.sessions.backends.file import SessionStore as FileSession
+>>> from django.contrib.sessions.backends.base import SessionBase
-
->>> db_session = DatabaseSession()
@@ -53 +54 @@
->>> cache_session.exists(cache_session.session_key)
-False
+
+>>> s = SessionBase()
+>>> s._session['some key'] = 'exists' # Pre-populate the session with some data
+>>> s.accessed = False   # Reset to pretend this wasn't accessed previously
+
+>>> s.accessed, s.modified
+(False, False)
+
+>>> s.pop('non existant key', 'does not exist')
+'does not exist'
+>>> s.accessed, s.modified
+(True, False)
+
+>>> s.accessed = False  # Reset the accessed flag
+
+>>> s.pop('some key')
+'exists'
+>>> s.accessed, s.modified
+(True, True)
+
+>>> s.pop('some key', 'does not exist')
+'does not exist'
-"""
-