summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTobias Kroenke <tobias@kroenke.de>2016-04-20 10:36:59 +0200
committerTim Graham <timograham@gmail.com>2016-04-20 13:06:47 -0400
commitb040ac06ebba2348cece7390b88f746d2c91d07b (patch)
tree5de9eeb2d1448854803505608513d5c5dd8ef1b1 /docs
parent973f393761253f5fbf031f435d103545f1927041 (diff)
Fixed #26520 -- Fixed a regression where SessionBase.pop() didn't return a KeyError.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.9.6.txt3
-rw-r--r--docs/topics/http/sessions.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/releases/1.9.6.txt b/docs/releases/1.9.6.txt
index 8b48f803c7..e505ee5923 100644
--- a/docs/releases/1.9.6.txt
+++ b/docs/releases/1.9.6.txt
@@ -18,3 +18,6 @@ Bugfixes
* Prevented ``makemigrations`` from generating infinite migrations for a model
field that references a ``functools.partial`` (:ticket:`26475`).
+
+* Fixed a regression where ``SessionBase.pop()`` returned ``None`` rather than
+ raising a ``KeyError`` for nonexistent values (:ticket:`26520`).
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 5e7bd74d2b..34a1b28b73 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -205,7 +205,7 @@ You can edit it multiple times.
Example: ``fav_color = request.session.get('fav_color', 'red')``
- .. method:: pop(key, default=None)
+ .. method:: pop(key, default=__not_given)
Example: ``fav_color = request.session.pop('fav_color', 'blue')``