encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-28 12:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ulmus/django-rest-framework

Browse Source 
Conflicts:
	djangorestframework/serializer.py

Signed-off-by: Jens Alm <jens.alm@mac.com>
This commit is contained in:
Jens Alm 2011-08-14 01:56:15 +02:00
commit e7f2242cfd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
djangorestframework/serializer.py
View File

@ -202,7 +202,11 @@ class Serializer(object):
return related_serializer(depth=depth, stack=stack).serialize(obj, request)
<<<<<<< HEAD
def serialize_max_depth(self, obj, request=None):
=======
def serialize_max_depth(self, obj, request):
>>>>>>> c59a37b0a6149f0d7c86000e1559c3a3d7a10873
"""
Determine how objects should be serialized once `depth` is exceeded.
The default behavior is to ignore the field.
@ -210,7 +214,11 @@ class Serializer(object):
raise _SkipField
<<<<<<< HEAD
def serialize_recursion(self, obj, request=None):
=======
def serialize_recursion(self, obj, request):
>>>>>>> c59a37b0a6149f0d7c86000e1559c3a3d7a10873
"""
Determine how objects should be serialized if recursion occurs.
The default behavior is to ignore the field.
@ -218,7 +226,11 @@ class Serializer(object):
raise _SkipField
<<<<<<< HEAD
def serialize_model(self, instance, request=None):
=======
def serialize_model(self, instance, request):
>>>>>>> c59a37b0a6149f0d7c86000e1559c3a3d7a10873
"""
Given a model instance or dict, serialize it to a dict..
"""