valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19345 from cachedout/django_cleanup

Browse Source 
Catch all Django errors and some PEP8 cleanup.
This commit is contained in:
Thomas S Hatch 2015-01-05 13:27:04 -07:00
commit 3de7cfc415
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/auth/django.py
View File

@ -53,13 +53,21 @@ try:
import django.conf
import django.contrib.auth
HAS_DJANGO = True
except ImportError:
except Exception as exc:
'''
If Django is installed and is not detected, uncommend
the following line to display additional information
'''
#log.warning('Could not load Django auth module. Found exception: {0}'.format(exc))
HAS_DJANGO = False
django_auth_class = None
def django_auth_setup():
'''
Prepare the connection to the Django authentication framework
'''
# Versions 1.7 and later of Django don't pull models until
# they are needed. When using framework facilities outside the
@ -70,7 +78,7 @@ def django_auth_setup():
django_model_name = django_model_fullname.split('.')[-1]
django_module_name = '.'.join(django_model_fullname.split('.')[0:-1])
django_auth_module = __import__(django_module_name, globals(), locals(), 'SaltExternalAuthModel')
__import__(django_module_name, globals(), locals(), 'SaltExternalAuthModel')
django_auth_class_str = 'django_auth_module.{0}'.format(django_model_name)
django_auth_class = eval(django_auth_class_str) # pylint: disable=W0123