Changeset 6831

Timestamp:

12/02/07 09:27:29 (10 months ago)

Author:

mtredinnick

Message:

Fixed #6087 -- Added setdefault() support to the Session object. Thanks, Ben
Slavin.

Files:

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

django/trunk/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):

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

@@ -67 +67 @@
-(True, False)
-
+>>> s.setdefault('foo', 'bar')
+'bar'
+>>> s.setdefault('foo', 'baz')
+'bar'
+
->>> s.accessed = False  # Reset the accessed flag
-

django/trunk/docs/sessions.txt

@@ -99 +99 @@
-
-    * ``items()``
+
+    * ``setdefault()``
-
-It also has these three methods: