diff options
| author | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
|---|---|---|
| committer | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
| commit | e84bf2140c33b45d1d9d8325eeaf62a97c46495e (patch) | |
| tree | d95d6755f787c8ab3d8c555315d514c067121bf9 /djangorestframework/serializer.py | |
| parent | 0632e946f977609ca6d6f4272f02c72dee1f49be (diff) | |
| parent | 4f42303035c094a1d0c6128f0ccce1abfa6b72f4 (diff) | |
| download | django-rest-framework-e84bf2140c33b45d1d9d8325eeaf62a97c46495e.tar.bz2 | |
fix merge
Diffstat (limited to 'djangorestframework/serializer.py')
| -rw-r--r-- | djangorestframework/serializer.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py index 22efa5ed..55b84df1 100644 --- a/djangorestframework/serializer.py +++ b/djangorestframework/serializer.py @@ -106,7 +106,8 @@ class Serializer(object): def __init__(self, depth=None, stack=[], **kwargs): - self.depth = depth or self.depth + if depth is not None: + self.depth = depth self.stack = stack |