Ticket #6087: ticket_6087__rev_6812.diff

django/contrib/sessions/tests.py

@@ -66 +66 @@
->>> s.accessed, s.modified
-(True, False)
-
+>>> s.setdefault('foo', 'bar')
+'bar'
+>>> s.setdefault('foo', 'baz')
+'bar'
+
->>> s.accessed = False  # Reset the accessed flag
-
->>> s.pop('some key')

django/contrib/sessions/backends/base.py

@@ -51 +51 @@
-        self.modified = self.modified or key in self._session
-        return self._session.pop(key, *args)
-
+    def setdefault(self, key, value):
+        if key in self._session:
+            return self._session[key]
+        else:
+            self.modified = True
+            self._session[key] = value
+            return value
+
-    def set_test_cookie(self):
-        self[self.TEST_COOKIE_NAME] = self.TEST_COOKIE_VALUE
-