encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge e5b7963687 into 65a0d083d6

Browse Source
This commit is contained in:
bradyoo 2014-11-01 06:28:38 +00:00
commit 583e58087c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/fields.py
View File

@ -130,6 +130,7 @@ class Field(object):
widget = None widget = None
def __init__(self, source=None, label=None, help_text=None): def __init__(self, source=None, label=None, help_text=None):
super(Field, self).__init__()
self.parent = None self.parent = None
self.creation_counter = Field.creation_counter self.creation_counter = Field.creation_counter
@ -267,9 +268,9 @@ class WritableField(Field):
def __init__(self, source=None, label=None, help_text=None, def __init__(self, source=None, label=None, help_text=None,
read_only=False, write_only=False, required=None, read_only=False, write_only=False, required=None,
validators=[], error_messages=None, widget=None, validators=[], error_messages=None, widget=None,
default=None, blank=None): default=None, blank=None, *args, **kwargs):
super(WritableField, self).__init__(source=source, label=label, help_text=help_text) super(WritableField, self).__init__(source=source, label=label, help_text=help_text, *args, **kwargs)
self.read_only = read_only self.read_only = read_only
self.write_only = write_only self.write_only = write_only

4
rest_framework/serializers.py
View File

@ -184,8 +184,8 @@ class BaseSerializer(WritableField):
def __init__(self, instance=None, data=None, files=None, def __init__(self, instance=None, data=None, files=None,
context=None, partial=False, many=False, context=None, partial=False, many=False,
allow_add_remove=False, **kwargs): allow_add_remove=False, *args, **kwargs):
super(BaseSerializer, self).__init__(**kwargs) super(BaseSerializer, self).__init__(*args, **kwargs)
self.opts = self._options_class(self.Meta) self.opts = self._options_class(self.Meta)
self.parent = None self.parent = None
self.root = None self.root = None