From 88e1f3e51f9c67b0859283b0ca812f169e653334 Mon Sep 17 00:00:00 2001 From: lambdalisue Date: Fri, 8 Jan 2016 05:42:15 +0900 Subject: [PATCH] Use six.string_types instead of basestring --- src/permission/utils/autodiscover.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/permission/utils/autodiscover.py b/src/permission/utils/autodiscover.py index 8d7b5d4..eaa5e84 100644 --- a/src/permission/utils/autodiscover.py +++ b/src/permission/utils/autodiscover.py @@ -1,5 +1,6 @@ # coding=utf-8 import copy +from django.utils import six def autodiscover(module_name=None): @@ -63,7 +64,7 @@ def discover(app, module_name=None): # apply permission logics automatically permission_logic_set = getattr(m, variable_name) for model, permission_logic in permission_logic_set: - if isinstance(model, basestring): + if isinstance(model, six.string_types): # convert model string to model instance model = get_model(*model.split('.', 1)) add_permission_logic(model, permission_logic)