From ce6c27b228e94667a8e55c7d677536ebe70762fc Mon Sep 17 00:00:00 2001
From: Damien Nozay <damien.nozay@gmail.com>
Date: Mon, 5 Jan 2015 10:14:53 -0800
Subject: [PATCH] rework Field.__init__ to use either kwargs / class attrs.

Precedence is given to kwargs over class attributes.
You can create a subclass of a Field for 99% of your use cases while still
needing a one-off instance where you need to change an attribute; hence
kwargs is still useful.

Other important point is that kwargs is the current de-facto standard for
declaring fields in a serializer.

Conflicts:
	rest_framework/fields.py
---
 rest_framework/fields.py | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 71a9f1938..90eee3b02 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -155,15 +155,41 @@ class Field(object):
     }
     default_validators = []
     default_empty_html = empty
-    initial = None
 
-    def __init__(self, read_only=False, write_only=False,
-                 required=None, default=empty, initial=empty, source=None,
-                 label=None, help_text=None, style=None,
-                 error_messages=None, validators=None, allow_null=False):
+    # allows subclasses to change defaults
+    read_only = False
+    write_only = False
+    required = None
+    default = empty
+    initial = None
+    source = None
+    label = None
+    help_text = None
+    style = None
+    error_messages = None
+    validators = None
+    allow_null = False
+
+    def __init__(self, **kwargs):
         self._creation_counter = Field._creation_counter
         Field._creation_counter += 1
 
+        # precedence is given to kwargs over class attributes.
+        # you can create a subclass of a Field for maximum reuse while still
+        # needing a one-off instance where you need to change an attribute.
+        read_only = kwargs.pop('read_only', self.read_only)
+        write_only = kwargs.pop('write_only', self.write_only)
+        required = kwargs.pop('required', self.required)
+        default = kwargs.pop('default', self.default)
+        initial = kwargs.pop('initial', self.initial)
+        source = kwargs.pop('source', self.source)
+        label = kwargs.pop('label', self.label)
+        help_text = kwargs.pop('help_text', self.help_text)
+        style = kwargs.pop('style', self.style)
+        error_messages = kwargs.pop('error_messages', self.error_messages)
+        validators = kwargs.pop('validators', self.validators)
+        allow_null = kwargs.pop('allow_null', self.allow_null)
+
         # If `required` is unset, then use `True` unless a default is provided.
         if required is None:
             required = default is empty and not read_only
@@ -179,7 +205,7 @@ class Field(object):
         self.required = required
         self.default = default
         self.source = source
-        self.initial = self.initial if (initial is empty) else initial
+        self.initial = initial
         self.label = label
         self.help_text = help_text
         self.style = {} if style is None else style