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

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

Browse Source
This commit is contained in:
Jens Alm 2011-10-01 12:59:32 +02:00
commit b6913c516b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -17,6 +17,7 @@ Garcia Solero <garciasolero>
Tom Drummond <devioustree> Tom Drummond <devioustree>
Danilo Bargen <gwrtheyrn> Danilo Bargen <gwrtheyrn>
Andrew McCloud <amccloud> Andrew McCloud <amccloud>
Thomas Steinacher <thomasst>
THANKS TO: THANKS TO:

2
djangorestframework/permissions.py
View File

@ -73,7 +73,7 @@ class IsAdminUser(BasePermission):
""" """
def check_permission(self, user): def check_permission(self, user):
if not user.is_staff(): if not user.is_staff:
raise _403_FORBIDDEN_RESPONSE raise _403_FORBIDDEN_RESPONSE

3
djangorestframework/serializer.py
View File

@ -106,7 +106,8 @@ class Serializer(object):
def __init__(self, depth=None, stack=[], **kwargs): def __init__(self, depth=None, stack=[], **kwargs):
self.depth = depth or self.depth if depth is not None:
self.depth = depth
self.stack = stack self.stack = stack