From 8113d661260834a91d91481f31860398cde9212d Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 7 Feb 2013 09:24:34 +0000
Subject: [PATCH] Use new style of `required=<bool>` not `blank` or `null`

---
 rest_framework/serializers.py          | 8 +++-----
 rest_framework/tests/relations_slug.py | 2 +-
 rest_framework/tests/serializer.py     | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 6d7c5345c..7daeac417 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -481,17 +481,15 @@ class ModelSerializer(Serializer):
         Creates a default instance of a basic non-relational field.
         """
         kwargs = {}
+        has_default = model_field.has_default()
 
-        kwargs['blank'] = model_field.blank
-
-        if model_field.null or model_field.blank:
+        if model_field.null or model_field.blank or has_default:
             kwargs['required'] = False
 
         if isinstance(model_field, models.AutoField) or not model_field.editable:
             kwargs['read_only'] = True
 
-        if model_field.has_default():
-            kwargs['required'] = False
+        if has_default:
             kwargs['default'] = model_field.get_default()
 
         if issubclass(model_field.__class__, models.TextField):
diff --git a/rest_framework/tests/relations_slug.py b/rest_framework/tests/relations_slug.py
index ef829210c..a325f6eaf 100644
--- a/rest_framework/tests/relations_slug.py
+++ b/rest_framework/tests/relations_slug.py
@@ -18,7 +18,7 @@ class ForeignKeySourceSerializer(serializers.ModelSerializer):
 
 
 class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
-    target = serializers.SlugRelatedField(slug_field='name', null=True)
+    target = serializers.SlugRelatedField(slug_field='name', required=False)
 
     class Meta:
         model = NullableForeignKeySource
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 57429e2e9..62de16abb 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -802,7 +802,7 @@ class BlankFieldTests(TestCase):
                 model = BlankFieldModel
 
         class BlankFieldSerializer(serializers.Serializer):
-            title = serializers.CharField(blank=True)
+            title = serializers.CharField(required=False)
 
         class NotBlankFieldModelSerializer(serializers.ModelSerializer):
             class Meta: