Merge pull request #57 from epfl-idevelop/master

Change module discovery to use the one from Django
This commit is contained in:
Jannis Leidel 2020-02-07 11:06:21 +01:00 committed by GitHub
commit 82d7feb47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 28 deletions

View file

@ -19,6 +19,5 @@ def autodiscover():
return
LOADING = True
from authority import utils
utils.autodiscover_modules()
from django.utils.module_loading import autodiscover_modules
autodiscover_modules('permissions')

View file

@ -1,5 +1,3 @@
import sys
from authority.sites import (
site,
get_check,
@ -7,26 +5,3 @@ from authority.sites import (
register,
unregister,
) # noqa
def autodiscover_modules():
"""
Goes and imports the permissions submodule of every app in INSTALLED_APPS
to make sure the permission set classes are registered correctly.
"""
import imp
from django.conf import settings
for app in settings.INSTALLED_APPS:
try:
__import__(app)
app_path = sys.modules[app].__path__
except AttributeError:
continue
try:
imp.find_module("permissions", app_path)
except ImportError:
continue
__import__("%s.permissions" % app)
app_path = sys.modules["%s.permissions" % app]
LOADING = False