mini fix (#12)

Author: nxexox

docs/release-notes.md

@@ -8,6 +8,20 @@ Medium version numbers (0.x.0) may include API changes, in line with the [deprec
 
 Major version numbers (x.0.0) are reserved for substantial project milestones.
 
+### 0.3.6
+
+**Date:** [14th August 2019]
+
+* Fix for current remove fields from base serializer.
+```python
+class Ser(Serializer):
+    field_one = CharField()
+
+class TwoSer(Ser):
+    field_one = None
+
+```
+
 ### 0.3.5
 
 **Date:** [22th Jule 2019]

rest_framework/__init__.py

@@ -8,7 +8,7 @@
          __/ |
         |___/
 """
-VERSION = (0, 3, 5)
+VERSION = (0, 3, 6)
 
 __title__ = 'Python-Rest-Framework'
 __author__ = 'Deys Timofey'

rest_framework/serializers/serializers.py

@@ -47,31 +47,36 @@ def get_fields(self, cls=None):
         _declared_fields = OrderedDict()
 
         for _cls in reversed((cls or self.cls).__mro__):
-            _current_fields = self.get_fields_from_cls(_cls)
+            _current_fields, _remove_fields = self.get_fields_from_cls(_cls, _declared_fields)
             # print(_cls, _current_fields)
             _declared_fields.update(_current_fields)
+            for name in _remove_fields:
+                del _declared_fields[name]
 
         return _declared_fields
 
-    def get_fields_from_cls(self, cls):
+    def get_fields_from_cls(self, cls, current_fields):
         """
         Search fields for one class.
 
         :param rest_framework.serializers.Serializer cls: Class for search fields.
+        :param collections.OrderedDict current_fields: Current searching fields.
 
-        :return: Dict fields for class.
-        :rtype: collections.OrderedDict
+        :return: Dict fields for class. Tuple[new_fields, remove_fields]
+        :rtype: Tuple[collections.OrderedDict, list]
 
         """
-        _declared_fields = OrderedDict()
+        _declared_fields, _remove_fields = OrderedDict(), []
 
         # Fill storage of fields.
         for name, obj in six.iteritems(cls.__dict__):
             if isinstance(obj, Field):
                 _declared_fields[name] = obj
+            elif name in current_fields:
+                _remove_fields.append(name)
 
         # Forward storage of fields to the class itself.
-        return _declared_fields
+        return _declared_fields, _remove_fields
 
 
 class BaseSerializerMeta(type):