From ad01fa0eae990ca1607d44cbabba5425c9d0b9a4 Mon Sep 17 00:00:00 2001
From: Michal Dvorak
Date: Mon, 3 Dec 2012 19:07:07 +0100
Subject: #467 Added unit test

---
 rest_framework/serializers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 2dab7914..e4fcbd67 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -428,11 +428,11 @@ class ModelSerializer(Serializer):
         if max_length:
             kwargs['max_length'] = max_length
 
-        if model_field.verbose_name:
-            kwargs['label'] = model_field.verbose_name
+        if model_field.verbose_name is not None:
+            kwargs['label'] = smart_unicode(model_field.verbose_name)
 
-        if model_field.help_text:
-            kwargs['help_text'] = model_field.help_text
+        if model_field.help_text is not None:
+            kwargs['help_text'] = smart_unicode(model_field.help_text)
 
         field_mapping = {
             models.FloatField: FloatField,
-- 
cgit v1.2.3