aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatteo Suppo2013-03-23 14:18:55 +0100
committerMatteo Suppo2013-03-23 14:18:55 +0100
commitb5640bb77843c50f42a649982b9b9592113c6f59 (patch)
tree8fceebec0b76820f6f79bb8602f827a6440ae74d
parent0081d744b9f530b2418d1e82d7ad94a2ebc31c9c (diff)
downloaddjango-rest-framework-b5640bb77843c50f42a649982b9b9592113c6f59.tar.bz2
Forcing translations of lazy translatable strings in Field to_native method
-rw-r--r--rest_framework/fields.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index f3496b53..09f076ab 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -18,7 +18,7 @@ from rest_framework import ISO_8601
from rest_framework.compat import timezone, parse_date, parse_datetime, parse_time
from rest_framework.compat import BytesIO
from rest_framework.compat import six
-from rest_framework.compat import smart_text
+from rest_framework.compat import smart_text, force_text
from rest_framework.settings import api_settings
@@ -165,7 +165,7 @@ class Field(object):
return [self.to_native(item) for item in value]
elif isinstance(value, dict):
return dict(map(self.to_native, (k, v)) for k, v in value.items())
- return smart_text(value)
+ return force_text(value)
def attributes(self):
"""