Changeset 5592

Timestamp:

07/03/07 10:02:40 (1 year ago)

Author:

adrian

Message:

Fixed #4729 -- SessionWrapper?.pop now sets modified flag if necessary. Thanks, Ben Slavin, SmileyChris? and Collin Grady

Files:

• django/trunk/django/contrib/sessions/middleware.py (modified) (1 diff)
• django/trunk/django/contrib/sessions/tests.py (modified) (1 diff)

django/trunk/django/contrib/sessions/middleware.py

@@ -38 +38 @@
-
-    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

@@ -6 +6 @@
->>> s._session_cache['some key'] = 'exists'
-
+>>> s.accessed
+False
+>>> s.modified
+False
+
+>>> s.pop('non existant key', 'does not exist')
+'does not exist'
+>>> s.accessed
+True
+>>> s.modified
+False
+
->>> s.pop('some key')
-'exists'
+>>> s.accessed
+True
+>>> s.modified
+True
-
->>> s.pop('some key', 'does not exist')