diff options
author | Claude Paroz <claude@2xlibre.net> | 2016-12-29 16:27:49 +0100 |
---|---|---|
committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 20:18:46 +0100 |
commit | 7b2f2e74adb36a4334e83130f6abc2f79d395235 (patch) | |
tree | 313387ba6a6f1311b43cf5fb4f2576d2d6c4f805 /django/core/serializers/python.py | |
parent | f6acd1d271122d66de8061e75ae26137ddf02658 (diff) | |
download | django-7b2f2e74adb36a4334e83130f6abc2f79d395235.tar.gz |
Refs #23919 -- Removed six.<various>_types usage
Thanks Tim Graham and Simon Charette for the reviews.
Diffstat (limited to 'django/core/serializers/python.py')
-rw-r--r-- | django/core/serializers/python.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index a0cea14297..9db5c2e6a6 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -131,7 +131,7 @@ def Deserializer(object_list, **options): model = field.remote_field.model if hasattr(model._default_manager, 'get_by_natural_key'): def m2m_convert(value): - if hasattr(value, '__iter__') and not isinstance(value, six.text_type): + if hasattr(value, '__iter__') and not isinstance(value, str): return model._default_manager.db_manager(db).get_by_natural_key(*value).pk else: return force_text(model._meta.pk.to_python(value), strings_only=True) @@ -154,7 +154,7 @@ def Deserializer(object_list, **options): default_manager = model._default_manager field_name = field.remote_field.field_name if hasattr(default_manager, 'get_by_natural_key'): - if hasattr(field_value, '__iter__') and not isinstance(field_value, six.text_type): + if hasattr(field_value, '__iter__') and not isinstance(field_value, str): obj = default_manager.db_manager(db).get_by_natural_key(*field_value) value = getattr(obj, field.remote_field.field_name) # If this is a natural foreign key to an object that |