innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #26764 -- Fixed Session.cycle_key() crash on unaccessed session.

This commit is contained in:
Adam Zapletal 2016-08-08 12:01:25 -05:00 committed by Tim Graham
parent b8e6e1b43b
commit 887f3d3219
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,10 @@ class SessionBase(object):
""" """
Creates a new session key, while retaining the current session data. Creates a new session key, while retaining the current session data.
""" """
try:
data = self._session_cache data = self._session_cache
except AttributeError:
data = {}
key = self.session_key key = self.session_key
self.create() self.create()
self._session_cache = data self._session_cache = data

4
tests/sessions_tests/tests.py
View File

@ -188,6 +188,10 @@ class SessionTestsMixin(object):
self.assertNotEqual(self.session.session_key, prev_key) self.assertNotEqual(self.session.session_key, prev_key)
self.assertEqual(list(self.session.items()), prev_data) self.assertEqual(list(self.session.items()), prev_data)
def test_cycle_with_no_session_cache(self):
self.assertFalse(hasattr(self.session, '_session_cache'))
self.session.cycle_key()
def test_save_doesnt_clear_data(self): def test_save_doesnt_clear_data(self):
self.session['a'] = 'b' self.session['a'] = 'b'
self.session.save() self.session.save()