Ticket #7515: session_clear-with_docs2.diff

django/contrib/sessions/tests.py

@@ -147 +147 @@
->>> list(i)
-[('x', 1)]
-
+# test .clear()
+>>> s.modified = s.accessed = False
+>>> s.items()
+[('x', 1)]
+>>> s.clear()
+>>> s.items()
+[]
+>>> s.accessed, s.modified
+(True, True)
- 
-
-#########################

django/contrib/sessions/backends/base.py

@@ -52 +52 @@
-        self.modified = self.modified or key in self._session
-        return self._session.pop(key, *args)
-
+    def clear(self):
+        self._session.clear()
+        self.modified = True
+
-    def setdefault(self, key, value):
-        if key in self._session:
-            return self._session[key]

docs/sessions.txt

@@ -106 +106 @@
-
-    * ``setdefault()`` (**New in Django development version**)
-
+    * ``clear()`` (**New in Django development version**)
+
+      This clears all session data. It results in an empty session that is
+      saved to the session store.
+
-It also has these methods:
-
-    * ``set_test_cookie()``