entrouvert
/
debian-django-rest-framework
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #3668 from akx/exc-hiding 

Reveal previously hidden AttributeErrors and TypeErrors
This commit is contained in:
Tom Christie 2015-11-27 11:51:25 +00:00
parent 0e4ea2a591 69688289ce
commit 0d0aff44ac
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rest_framework/permissions.py
View File

@ -112,15 +112,15 @@ class DjangoModelPermissions(BasePermission):
if getattr(view, '_ignore_model_permissions', False):
return True
try:
if hasattr(view, 'get_queryset'):
queryset = view.get_queryset()
except AttributeError:
else:
queryset = getattr(view, 'queryset', None)
assert queryset is not None, (
'Cannot apply DjangoModelPermissions on a view that '
'does not have `.queryset` property or overrides the '
'`.get_queryset()` method.')
'does not set `.queryset` or have a `.get_queryset()` method.'
)
perms = self.get_required_permissions(request.method, queryset.model)
@ -169,15 +169,15 @@ class DjangoObjectPermissions(DjangoModelPermissions):
return [perm % kwargs for perm in self.perms_map[method]]
def has_object_permission(self, request, view, obj):
try:
if hasattr(view, 'get_queryset'):
queryset = view.get_queryset()
except AttributeError:
else:
queryset = getattr(view, 'queryset', None)
assert queryset is not None, (
'Cannot apply DjangoObjectPermissions on a view that '
'does not have `.queryset` property or overrides the '
'`.get_queryset()` method.')
'does not set `.queryset` or have a `.get_queryset()` method.'
)
model_cls = queryset.model
user = request.user