Skip to content

Make use of autodiscover_modules instead of python import_module. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lefterisnik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make use of autodiscover_modules instead of python import_module. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7f9f3
Make use of autodiscover_modules instead of python import_module.
lefterisnik Mar 23, 2017
ec2b427
Remove app namespace from the get_model_string.
lefterisnik Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions badgify/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
logger = logging.getLogger('badgify')


try:
from django.utils.module_loading import autodiscover_modules
except ImportError:
autodiscover_modules = None


class BadgifyRegistry(object):
"""
Badge recipes registry.
Expand Down Expand Up @@ -121,13 +127,7 @@ def get_recipe_instance_from_class(klass):
def _autodiscover(recipes):
import copy
from django.conf import settings

try:
# py27 / py3 only
from importlib import import_module
except ImportError:
from django.utils.importlib import import_module

from django.utils.importlib import import_module
from django.utils.module_loading import module_has_submodule

for app in settings.INSTALLED_APPS:
Expand All @@ -145,7 +145,17 @@ def _autodiscover(recipes):


def autodiscover():
_autodiscover(registry)
"""
Check all apps in INSTALLED_APPS for stuff related to badgify_recipes.

For each app, autodiscover imports ``app.badgify_recipes`` if
possing, resulting in execution of :py:func:`register()` statements in that
module, filling up :py:data:`registry`.
"""
if autodiscover_modules:
autodiscover_modules('badgify_recipes')
else:
_autodiscover(registry)


def register(*args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion badgify/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def get_model_string(model_name):

Borrowed from: https://github.com/thoas/django-discussions/blob/master/discussions/utils.py
"""
setting_name = 'BADGIFY_%s_MODEL' % model_name.upper().replace('_', '')
setting_name = '%s_MODEL' % model_name.upper().replace('_', '')
class_path = getattr(settings, setting_name, None)
if not class_path:
return 'badgify.%s' % model_name
Expand Down