Fix failing 'default' on ModelSerializer

3 files changed, 14 insertions, 12 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index d4fcddd5..db6f9f61 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -410,7 +410,7 @@ class ModelSerializer(Serializer):
         kwargs = {}
         if model_field.has_default():
             kwargs['required'] = False
-            kwargs['default'] = model_field.default
+            kwargs['default'] = model_field.get_default()
 
         if model_field.__class__ == models.TextField:
             kwargs['widget'] = widgets.Textarea
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 97cd0849..0ee18c69 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -62,12 +62,12 @@ class CallableDefaultValueModel(RESTFrameworkModel):
 
 class ManyToManyModel(RESTFrameworkModel):
     rel = models.ManyToManyField(Anchor)
-    
+
 
 class ReadOnlyManyToManyModel(RESTFrameworkModel):
     text = models.CharField(max_length=100, default='anchor')
     rel = models.ManyToManyField(Anchor)
-       
+
 # Models to test generic relations
 
 
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 936f15aa..67c97f0f 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -7,7 +7,7 @@ from rest_framework.tests.models import *
 class SubComment(object):
     def __init__(self, sub_comment):
         self.sub_comment = sub_comment
-            
+
 
 class Comment(object):
     def __init__(self, email, content, created):
@@ -18,7 +18,7 @@ class Comment(object):
     def __eq__(self, other):
         return all([getattr(self, attr) == getattr(other, attr)
                     for attr in ('email', 'content', 'created')])
-                    
+
     def get_sub_comment(self):
         sub_comment = SubComment('And Merry Christmas!')
         return sub_comment
@@ -29,7 +29,7 @@ class CommentSerializer(serializers.Serializer):
     content = serializers.CharField(max_length=1000)
     created = serializers.DateTimeField()
     sub_comment = serializers.Field(source='get_sub_comment.sub_comment')
-    
+
     def restore_object(self, data, instance=None):
         if instance is None:
             return Comment(**data)
@@ -42,6 +42,7 @@ class ActionItemSerializer(serializers.ModelSerializer):
     class Meta:
         model = ActionItem
 
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -73,7 +74,7 @@ class BasicTests(TestCase):
         self.assertEquals(serializer.data, expected)
 
     def test_retrieve(self):
-        serializer = CommentSerializer(instance=self.comment)        
+        serializer = CommentSerializer(instance=self.comment)
         self.assertEquals(serializer.data, self.expected)
 
     def test_create(self):
@@ -104,7 +105,7 @@ class ValidationTests(TestCase):
             'email': 'tom@example.com',
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
-        }         
+        }
         self.actionitem = ActionItem('Some to do item',
         )
 
@@ -131,7 +132,7 @@ class ValidationTests(TestCase):
         """Make sure that a boolean value with a 'False' value is not
         mistaken for not having a default."""
         data = {
-            'title':'Some action item',
+            'title': 'Some action item',
             #No 'done' value.
         }
         serializer = ActionItemSerializer(data, instance=self.actionitem)
@@ -295,11 +296,13 @@ class ManyToManyTests(TestCase):
         self.assertEquals(len(ManyToManyModel.objects.all()), 2)
         self.assertEquals(instance.pk, 2)
         self.assertEquals(list(instance.rel.all()), [])
-        
+
+
 class ReadOnlyManyToManyTests(TestCase):
     def setUp(self):
         class ReadOnlyManyToManySerializer(serializers.ModelSerializer):
-            rel =  serializers.ManyRelatedField(readonly=True)
+            rel = serializers.ManyRelatedField(readonly=True)
+
             class Meta:
                 model = ReadOnlyManyToManyModel
 
@@ -317,7 +320,6 @@ class ReadOnlyManyToManyTests(TestCase):
         # A serialized representation of the model instance
         self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'}
 
-
     def test_update(self):
         """
         Attempt to update an instance of a model with a ManyToMany