aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index c83ee5ec..3c4e975a 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -108,7 +108,7 @@ class Field(object):
use_files = False
form_field_class = forms.CharField
- def __init__(self, source=None):
+ def __init__(self, source=None, label=None, help_text=None):
self.parent = None
self.creation_counter = Field.creation_counter
@@ -116,6 +116,12 @@ class Field(object):
self.source = source
+ if label is not None:
+ self.label = smart_unicode(label)
+
+ if help_text is not None:
+ self.help_text = smart_unicode(help_text)
+
def initialize(self, parent, field_name):
"""
Called to set up a field prior to field_to_native or field_from_native.
@@ -194,7 +200,8 @@ class WritableField(Field):
widget = widgets.TextInput
default = None
- def __init__(self, source=None, read_only=False, required=None,
+ def __init__(self, source=None, label=None, help_text=None,
+ read_only=False, required=None,
validators=[], error_messages=None, widget=None,
default=None, blank=None):
@@ -205,7 +212,7 @@ class WritableField(Field):
DeprecationWarning, stacklevel=2)
required = not(blank)
- super(WritableField, self).__init__(source=source)
+ super(WritableField, self).__init__(source=source, label=label, help_text=help_text)
self.read_only = read_only
if required is None: