aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework
diff options
context:
space:
mode:
authorTom Christie2012-06-28 05:06:48 -0700
committerTom Christie2012-06-28 05:06:48 -0700
commitc124585df6e7cc4c4103f6118975013cfadca9e7 (patch)
tree40454f839a72af373b930ee9a00950e33d359c10 /djangorestframework
parent9dbaac3182aa8e5c322e25513cd2e3d2bf0af1e2 (diff)
parent1b49c5e3e5c1b33d8d4c2dcaaaf6cb4dcbffa814 (diff)
downloaddjango-rest-framework-c124585df6e7cc4c4103f6118975013cfadca9e7.tar.bz2
Merge pull request #219 from scfarley/related-serializers-2
Pass request to related serializers
Diffstat (limited to 'djangorestframework')
-rw-r--r--djangorestframework/serializer.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/djangorestframework/serializer.py b/djangorestframework/serializer.py
index 9481eeff..ffe9d8cb 100644
--- a/djangorestframework/serializer.py
+++ b/djangorestframework/serializer.py
@@ -179,7 +179,8 @@ class Serializer(object):
stack = self.stack[:]
stack.append(obj)
- return related_serializer(depth=depth, stack=stack).serialize(obj)
+ return related_serializer(depth=depth, stack=stack).serialize(
+ obj, request=self.request)
def serialize_max_depth(self, obj):
"""
@@ -253,11 +254,15 @@ class Serializer(object):
"""
return smart_unicode(obj, strings_only=True)
- def serialize(self, obj):
+ def serialize(self, obj, request=None):
"""
Convert any object into a serializable representation.
"""
+ # Request from related serializer.
+ if request is not None:
+ self.request = request
+
if isinstance(obj, (dict, models.Model)):
# Model instances & dictionaries
return self.serialize_model(obj)