Merge ab3892342b into 99382f3ccb

rest_framework/serializers.py

@@ -351,6 +351,16 @@ class Serializer(BaseSerializer):
         'invalid': _('Invalid data. Expected a dictionary, but got {datatype}.')
     }
 
+    @property
+    def depth(self):
+        if not hasattr(self, '_depth'):
+            self._depth = getattr(self.Meta, 'depth', 0)
+        return self._depth
+
+    @depth.setter
+    def depth(self, value):
+        self._depth = value
+
     @property
     def fields(self):
         """
@@ -983,7 +993,7 @@ class ModelSerializer(Serializer):
 
         declared_fields = copy.deepcopy(self._declared_fields)
         model = getattr(self.Meta, 'model')
-        depth = getattr(self.Meta, 'depth', 0)
+        depth = self.depth
 
         if depth is not None:
             assert depth >= 0, "'depth' may not be negative."