mirror of
https://github.com/jazzband/django-authority.git
synced 2026-03-16 22:20:28 +00:00
Remove use of six.
This commit is contained in:
parent
f0948c08e9
commit
ff95d54a26
1 changed files with 8 additions and 3 deletions
|
|
@ -2,7 +2,6 @@ import inspect
|
|||
from django.http import HttpResponseRedirect
|
||||
from django.utils.http import urlquote
|
||||
from django.utils.functional import wraps
|
||||
from django.utils.six import string_types
|
||||
from django.db.models import Model
|
||||
from django.apps import apps
|
||||
from django.shortcuts import get_object_or_404
|
||||
|
|
@ -13,6 +12,12 @@ from authority.utils import get_check
|
|||
from authority.views import permission_denied
|
||||
|
||||
|
||||
try:
|
||||
basestring
|
||||
except NameError:
|
||||
basestring = str
|
||||
|
||||
|
||||
def permission_required(perm, *lookup_variables, **kwargs):
|
||||
"""
|
||||
Decorator for views that checks whether a user has a particular permission
|
||||
|
|
@ -27,7 +32,7 @@ def permission_required(perm, *lookup_variables, **kwargs):
|
|||
if request.user.is_authenticated:
|
||||
params = []
|
||||
for lookup_variable in lookup_variables:
|
||||
if isinstance(lookup_variable, string_types):
|
||||
if isinstance(lookup_variable, basestring):
|
||||
value = kwargs.get(lookup_variable, None)
|
||||
if value is None:
|
||||
continue
|
||||
|
|
@ -37,7 +42,7 @@ def permission_required(perm, *lookup_variables, **kwargs):
|
|||
value = kwargs.get(varname, None)
|
||||
if value is None:
|
||||
continue
|
||||
if isinstance(model, string_types):
|
||||
if isinstance(model, basestring):
|
||||
model_class = apps.get_model(*model.split("."))
|
||||
else:
|
||||
model_class = model
|
||||
|
|
|
|||
Loading…
Reference in a new issue