summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-12-29 16:27:49 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 20:18:46 +0100
commit7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch)
tree313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/test/utils.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index 5ed32dbab5..7395396fbb 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -61,7 +61,7 @@ class ContextList(list):
in a list of context objects.
"""
def __getitem__(self, key):
- if isinstance(key, six.string_types):
+ if isinstance(key, str):
for subcontext in self:
if key in subcontext:
return subcontext[key]
@@ -478,7 +478,7 @@ class modify_settings(override_settings):
value = list(getattr(settings, name, []))
for action, items in operations.items():
# items my be a single value or an iterable.
- if isinstance(items, six.string_types):
+ if isinstance(items, str):
items = [items]
if action == 'append':
value = value + [item for item in items if item not in value]