p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #24621 -- Fixed and documented SessionBase.pop's second argument 

Changed SessionBase.pop's second argument to explicitly be default=None
rather than *args since _session is always a dict. Thanks gabor for the
report and Tim Graham for the review.
This commit is contained in:
Adam Zapletal 2015-04-13 08:48:16 -05:00 committed by Tim Graham
parent b295fcd19c
commit 872eb26f54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/sessions/backends/base.py
View File

@ -58,9 +58,9 @@ class SessionBase(object):
def get(self, key, default=None): def get(self, key, default=None):
return self._session.get(key, default) return self._session.get(key, default)
def pop(self, key, *args): def pop(self, key, default=None):
self.modified = self.modified or key in self._session self.modified = self.modified or key in self._session
return self._session.pop(key, *args) return self._session.pop(key, default)
def setdefault(self, key, value): def setdefault(self, key, value):
if key in self._session: if key in self._session:

4
docs/topics/http/sessions.txt
View File

@ -205,9 +205,9 @@ You can edit it multiple times.
Example: ``fav_color = request.session.get('fav_color', 'red')`` Example: ``fav_color = request.session.get('fav_color', 'red')``
.. method:: pop(key) .. method:: pop(key, default=None)
Example: ``fav_color = request.session.pop('fav_color')`` Example: ``fav_color = request.session.pop('fav_color', 'blue')``
.. method:: keys() .. method:: keys()