Fixed #17450 -- Added missing import to auth models module forgotten in r17253. Thanks, aalbrecht.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7a67102e8d
commit
64066a59d9
|
@ -4,6 +4,7 @@ from django.core.exceptions import ImproperlyConfigured
|
||||||
from django.core.mail import send_mail
|
from django.core.mail import send_mail
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models.manager import EmptyManager
|
from django.db.models.manager import EmptyManager
|
||||||
|
from django.utils.crypto import get_random_string
|
||||||
from django.utils.encoding import smart_str
|
from django.utils.encoding import smart_str
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
@ -31,7 +32,7 @@ class PermissionManager(models.Manager):
|
||||||
def get_by_natural_key(self, codename, app_label, model):
|
def get_by_natural_key(self, codename, app_label, model):
|
||||||
return self.get(
|
return self.get(
|
||||||
codename=codename,
|
codename=codename,
|
||||||
content_type=ContentType.objects.get_by_natural_key(app_label, model)
|
content_type=ContentType.objects.get_by_natural_key(app_label, model),
|
||||||
)
|
)
|
||||||
|
|
||||||
class Permission(models.Model):
|
class Permission(models.Model):
|
||||||
|
|
Loading…
Reference in New Issue