p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #23919 -- Removed SessionBase.iterkeys(), itervalues(), iteritems(). 

These methods only work on Python 2.
This commit is contained in:
Srinivas Reddy Thatiparthy 2017-01-19 23:46:22 +05:30 committed by Tim Graham
parent 9ee47ce7b4
commit eb0b921c29
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,15 +131,6 @@ class SessionBase:
def items(self): def items(self):
return self._session.items() return self._session.items()
def iterkeys(self):
return self._session.iterkeys()
def itervalues(self):
return self._session.itervalues()
def iteritems(self):
return self._session.iteritems()
def clear(self): def clear(self):
# To avoid unnecessary persistent storage accesses, we set up the # To avoid unnecessary persistent storage accesses, we set up the
# internals directly (loading data wastes time, since we are going to # internals directly (loading data wastes time, since we are going to

26
tests/sessions_tests/tests.py
View File

@ -116,37 +116,27 @@ class SessionTestsMixin:
self.assertEqual(list(self.session.values()), []) self.assertEqual(list(self.session.values()), [])
self.assertTrue(self.session.accessed) self.assertTrue(self.session.accessed)
self.session['some key'] = 1 self.session['some key'] = 1
self.session.modified = False
self.session.accessed = False
self.assertEqual(list(self.session.values()), [1]) self.assertEqual(list(self.session.values()), [1])
self.assertTrue(self.session.accessed)
self.assertFalse(self.session.modified)
def test_iterkeys(self): def test_keys(self):
self.session['x'] = 1 self.session['x'] = 1
self.session.modified = False self.session.modified = False
self.session.accessed = False self.session.accessed = False
i = iter(self.session.keys()) self.assertEqual(list(self.session.keys()), ['x'])
self.assertTrue(hasattr(i, '__iter__'))
self.assertTrue(self.session.accessed) self.assertTrue(self.session.accessed)
self.assertFalse(self.session.modified) self.assertFalse(self.session.modified)
self.assertEqual(list(i), ['x'])
def test_itervalues(self): def test_items(self):
self.session['x'] = 1 self.session['x'] = 1
self.session.modified = False self.session.modified = False
self.session.accessed = False self.session.accessed = False
i = iter(self.session.values()) self.assertEqual(list(self.session.items()), [('x', 1)])
self.assertTrue(hasattr(i, '__iter__'))
self.assertTrue(self.session.accessed) self.assertTrue(self.session.accessed)
self.assertFalse(self.session.modified) self.assertFalse(self.session.modified)
self.assertEqual(list(i), [1])
def test_iteritems(self):
self.session['x'] = 1
self.session.modified = False
self.session.accessed = False
i = iter(self.session.items())
self.assertTrue(hasattr(i, '__iter__'))
self.assertTrue(self.session.accessed)
self.assertFalse(self.session.modified)
self.assertEqual(list(i), [('x', 1)])
def test_clear(self): def test_clear(self):
self.session['x'] = 1 self.session['x'] = 1