Moved smart_unicode to Field ctor, to mimic Django Forms behavior.

1 files changed, 6 insertions, 2 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 74b4cb7c..f57dc57f 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -45,8 +45,12 @@ class Field(object):
         Field.creation_counter += 1
 
         self.source = source
-        self.label = label
-        self.help_text = help_text
+
+        if label is not None:
+            self.label = smart_unicode(label)
+
+        if help_text is not None:
+            self.help_text = smart_unicode(help_text)
 
     def initialize(self, parent, field_name):
         """