From c430d471e6633e56851acd7cb1ca27ea8b94153f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 5 Dec 2018 04:43:47 -0400 Subject: [PATCH] Setting: Improve type checking Update the type checking from using Django's six port to use direct list and tuple instance checking. Needed for Python 3. Signed-off-by: Roberto Rosario --- mayan/apps/smart_settings/classes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mayan/apps/smart_settings/classes.py b/mayan/apps/smart_settings/classes.py index 9e9e1aea0d..e0615818a3 100644 --- a/mayan/apps/smart_settings/classes.py +++ b/mayan/apps/smart_settings/classes.py @@ -10,7 +10,6 @@ import yaml from django.apps import apps from django.conf import settings -from django.utils import six from django.utils.functional import Promise from django.utils.encoding import force_text, python_2_unicode_compatible @@ -84,7 +83,7 @@ class Setting(object): """ Walk all the elements of a value and force promises to text """ - if isinstance(value, (six.types.ListType, six.types.TupleType)): + if isinstance(value, (list, tuple)): return [Setting.express_promises(item) for item in value] elif isinstance(value, Promise): return force_text(value)