aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/test_permissions.py
diff options
context:
space:
mode:
authorMarkus Kaiserswerth2013-09-23 17:48:25 +0200
committerMarkus Kaiserswerth2013-09-23 17:48:25 +0200
commitabbe9213f98b5e1d3b53db2c1711d9221c5b257f (patch)
treef4cc92b7af363d7f1057d00af6ba2b84a220d766 /rest_framework/tests/test_permissions.py
parent0e58d4c74fb10b0fba90ae74bf3de5bca98cf608 (diff)
downloaddjango-rest-framework-abbe9213f98b5e1d3b53db2c1711d9221c5b257f.tar.bz2
Address pending deprecation of Model._meta.module_name in Django 1.6
Diffstat (limited to 'rest_framework/tests/test_permissions.py')
-rw-r--r--rest_framework/tests/test_permissions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py
index d08124f4..6e3a6303 100644
--- a/rest_framework/tests/test_permissions.py
+++ b/rest_framework/tests/test_permissions.py
@@ -4,7 +4,7 @@ from django.db import models
from django.test import TestCase
from django.utils import unittest
from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING
-from rest_framework.compat import guardian
+from rest_framework.compat import guardian, get_model_name
from rest_framework.filters import DjangoObjectPermissionsFilter
from rest_framework.test import APIRequestFactory
from rest_framework.tests.models import BasicModel
@@ -202,7 +202,7 @@ class ObjectPermissionsIntegrationTests(TestCase):
# give everyone model level permissions, as we are not testing those
everyone = Group.objects.create(name='everyone')
- model_name = BasicPermModel._meta.module_name
+ model_name = get_model_name(BasicPermModel)
app_label = BasicPermModel._meta.app_label
f = '{0}_{1}'.format
perms = {