From 157c42a976966b4d0a159e414f892ece7474180a Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Thu, 7 Aug 2014 22:33:42 +1000 Subject: [PATCH] Use smart_text rather than naive forcing-to-unicode for state reading --- django/db/migrations/state.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py index 4f65a12c6d..ab4aaf6e3e 100644 --- a/django/db/migrations/state.py +++ b/django/db/migrations/state.py @@ -8,7 +8,7 @@ from django.db.models.fields.related import do_pending_lookups from django.db.models.fields.proxy import OrderWrt from django.conf import settings from django.utils import six -from django.utils.encoding import force_text +from django.utils.encoding import force_text, smart_text from django.utils.module_loading import import_string @@ -255,7 +255,7 @@ class ModelState(object): @classmethod def force_text_recursive(cls, value): if isinstance(value, six.string_types): - return six.text_type(value) + return smart_text(value) elif isinstance(value, list): return [cls.force_text_recursive(x) for x in value] elif isinstance(value, tuple):