summaryrefslogtreecommitdiff
path: root/tests/httpwrappers
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2017-05-27 16:08:46 -0700
committerTim Graham <timograham@gmail.com>2017-05-27 19:08:46 -0400
commit21046e77734278cea871dce922220bf29aa5b7b4 (patch)
treee0820850a3d058c35307916da793668f7e5c48b3 /tests/httpwrappers
parent2a5708a304cf337dbf556e2bd87a930079f8f766 (diff)
downloaddjango-21046e77734278cea871dce922220bf29aa5b7b4.tar.gz
Fixed #28249 -- Removed unnecessary dict.keys() calls.
iter(dict) is equivalent to iter(dict.keys()).
Diffstat (limited to 'tests/httpwrappers')
-rw-r--r--tests/httpwrappers/tests.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
index 88c32f3b0c..ab7c6ce3ff 100644
--- a/tests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -53,6 +53,7 @@ class QueryDictTests(SimpleTestCase):
q = QueryDict()
self.assertEqual(q.getlist('foo'), [])
self.assertNotIn('foo', q)
+ self.assertEqual(list(q), [])
self.assertEqual(list(q.items()), [])
self.assertEqual(list(q.lists()), [])
self.assertEqual(list(q.keys()), [])
@@ -83,6 +84,7 @@ class QueryDictTests(SimpleTestCase):
self.assertIn('foo', q)
self.assertNotIn('bar', q)
+ self.assertEqual(list(q), ['foo'])
self.assertEqual(list(q.items()), [('foo', 'bar')])
self.assertEqual(list(q.lists()), [('foo', ['bar'])])
self.assertEqual(list(q.keys()), ['foo'])
@@ -143,6 +145,7 @@ class QueryDictTests(SimpleTestCase):
self.assertEqual(q['foo'], 'another')
self.assertIn('foo', q)
+ self.assertCountEqual(q, ['foo', 'name'])
self.assertCountEqual(q.items(), [('foo', 'another'), ('name', 'john')])
self.assertCountEqual(q.lists(), [('foo', ['bar', 'baz', 'another']), ('name', ['john'])])
self.assertCountEqual(q.keys(), ['foo', 'name'])
@@ -186,6 +189,7 @@ class QueryDictTests(SimpleTestCase):
self.assertIn('vote', q)
self.assertNotIn('foo', q)
+ self.assertEqual(list(q), ['vote'])
self.assertEqual(list(q.items()), [('vote', 'no')])
self.assertEqual(list(q.lists()), [('vote', ['yes', 'no'])])
self.assertEqual(list(q.keys()), ['vote'])
@@ -697,13 +701,13 @@ class CookieTests(unittest.TestCase):
"""
A single non-standard cookie name doesn't affect all cookies (#13007).
"""
- self.assertIn('good_cookie', parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
+ self.assertIn('good_cookie', parse_cookie('good_cookie=yes;bad:cookie=yes'))
def test_repeated_nonstandard_keys(self):
"""
A repeated non-standard name doesn't affect all cookies (#15852).
"""
- self.assertIn('good_cookie', parse_cookie('a:=b; a:=c; good_cookie=yes').keys())
+ self.assertIn('good_cookie', parse_cookie('a:=b; a:=c; good_cookie=yes'))
def test_python_cookies(self):
"""
@@ -737,7 +741,7 @@ class CookieTests(unittest.TestCase):
"""
# Chunks without an equals sign appear as unnamed values per
# https://bugzilla.mozilla.org/show_bug.cgi?id=169091
- self.assertIn('django_language', parse_cookie('abc=def; unnamed; django_language=en').keys())
+ self.assertIn('django_language', parse_cookie('abc=def; unnamed; django_language=en'))
# Even a double quote may be an unamed value.
self.assertEqual(parse_cookie('a=b; "; c=d'), {'a': 'b', '': '"', 'c': 'd'})
# Spaces in names and values, and an equals sign in values.