summaryrefslogtreecommitdiff
path: root/django/db/models/options.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/db/models/options.py
parentf6acd1d271122d66de8061e75ae26137ddf02658 (diff)
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/db/models/options.py')
-rw-r--r--django/db/models/options.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py
index a4593d125a..cf3e031104 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -310,7 +310,7 @@ class Options(object):
"""
if self.proxy or self.swapped or not self.managed:
return False
- if isinstance(connection, six.string_types):
+ if isinstance(connection, str):
connection = connections[connection]
if self.required_db_vendor:
return self.required_db_vendor == connection.vendor
@@ -689,7 +689,7 @@ class Options(object):
if f.is_relation and f.related_model is not None
)
for f in fields_with_relations:
- if not isinstance(f.remote_field.model, six.string_types):
+ if not isinstance(f.remote_field.model, str):
related_objects_graph[f.remote_field.model._meta.concrete_model._meta].append(f)
for model in all_models: