Merge master

1 files changed, 2 insertions, 12 deletions

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 0f943d79..b589eca8 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -218,18 +218,6 @@ class BaseSerializer(WritableField):
         return ret
 
     #####
-    # Field methods - used when the serializer class is itself used as a field.
-
-    def initialize(self, parent, field_name):
-        """
-        Same behaviour as usual Field, except that we need to keep track
-        of state so that we can deal with handling maximum depth.
-        """
-        super(BaseSerializer, self).initialize(parent, field_name)
-        if parent.opts.depth:
-            self.opts.depth = parent.opts.depth - 1
-
-    #####
     # Methods to convert or revert from objects <--> primitive representations.
 
     def get_field_key(self, field_name):
@@ -683,6 +671,8 @@ class ModelSerializer(Serializer):
         class NestedModelSerializer(ModelSerializer):
             class Meta:
                 model = related_model
+                depth = self.opts.depth - 1
+
         return NestedModelSerializer(many=to_many)
 
     def get_related_field(self, model_field, related_model, to_many):