From 554f4e7aa8a3ffe65cac3b6698906c06e7db4fe6 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 1 Jun 2007 07:30:40 +0000 Subject: unicode: Reverted [5388] and fixed the problem in a different way. Checked every occurrence of smart_unicode() and force_unicode() that was not previously a str() call, so hopefully the problems will not reoccur. Fixed #4447. Refs #4435, #4430. git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5400 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/serializers/python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/core/serializers/python.py') diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index c0d2efab50..f61a2fa4a2 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -69,7 +69,7 @@ def Deserializer(object_list, **options): # Handle each field for (field_name, field_value) in d["fields"].iteritems(): if isinstance(field_value, str): - field_value = smart_unicode(field_value, options.get("encoding", settings.DEFAULT_CHARSET)) + field_value = smart_unicode(field_value, options.get("encoding", settings.DEFAULT_CHARSET), strings_only=True) field = Model._meta.get_field(field_name) -- cgit v1.3