diff options
| author | Markus Kaiserswerth | 2013-09-23 17:48:25 +0200 |
|---|---|---|
| committer | Markus Kaiserswerth | 2013-09-23 17:48:25 +0200 |
| commit | abbe9213f98b5e1d3b53db2c1711d9221c5b257f (patch) | |
| tree | f4cc92b7af363d7f1057d00af6ba2b84a220d766 /rest_framework/permissions.py | |
| parent | 0e58d4c74fb10b0fba90ae74bf3de5bca98cf608 (diff) | |
| download | django-rest-framework-abbe9213f98b5e1d3b53db2c1711d9221c5b257f.tar.bz2 | |
Address pending deprecation of Model._meta.module_name in Django 1.6
Diffstat (limited to 'rest_framework/permissions.py')
| -rw-r--r-- | rest_framework/permissions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 53184798..ab6655e7 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -8,7 +8,8 @@ import warnings SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] from django.http import Http404 -from rest_framework.compat import oauth2_provider_scope, oauth2_constants +from rest_framework.compat import (get_model_name, oauth2_provider_scope, + oauth2_constants) class BasePermission(object): @@ -116,7 +117,7 @@ class DjangoModelPermissions(BasePermission): """ kwargs = { 'app_label': model_cls._meta.app_label, - 'model_name': model_cls._meta.module_name + 'model_name': get_model_name(model_cls) } return [perm % kwargs for perm in self.perms_map[method]] @@ -177,7 +178,7 @@ class DjangoObjectPermissions(DjangoModelPermissions): def get_required_object_permissions(self, method, model_cls): kwargs = { 'app_label': model_cls._meta.app_label, - 'model_name': model_cls._meta.module_name + 'model_name': get_model_name(model_cls) } return [perm % kwargs for perm in self.perms_map[method]] |
