Merge pull request #172 from ariovistus/master

fix #171
marcgibbons · Dec 11, 2014 · d41d027 · d41d027
2 parents 7f3224d + a9bdfd5
commit d41d027
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/rest_framework_swagger/introspectors.py b/rest_framework_swagger/introspectors.py
@@ -20,7 +20,7 @@
 
 
 def get_default_value(field):
-    default_value = getattr(field, 'default')
+    default_value = getattr(field, 'default', None)
     if rest_framework.VERSION >= '3.0.0':
         from rest_framework.fields import empty
         if default_value == empty:

diff --git a/rest_framework_swagger/tests.py b/rest_framework_swagger/tests.py
@@ -381,6 +381,15 @@ def test_get_serializer_fields_api_with_no_serializer(self):
 
         self.assertIsNone(fields)
 
+    def test_get_serializer_fields_with_field(self):
+        class SomeSerializer(serializers.Serializer):
+            thing1 = serializers.Field()
+
+        docgen = DocumentationGenerator()
+        fields = docgen._get_serializer_fields(SomeSerializer)
+
+        self.assertEqual(1, len(fields['fields']))
+
     def test_get_serializer_fields_api_with_nested(self):
         class SomeSerializer(serializers.Serializer):
             thing1 = serializers.CharField()