Skip to content

Do not touch INSTALLED_APPS #146

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not touch INSTALLED_APPS #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions dajaxice/core/Dajaxice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import logging

from django.utils.importlib import import_module

log = logging.getLogger('dajaxice')


Expand Down Expand Up @@ -117,21 +115,27 @@ def dajaxice_autodiscover():
return
LOADING_DAJAXICE = True

import imp
from django.conf import settings
import django

for app in settings.INSTALLED_APPS:
if django.VERSION[0:2] >= (1,7):
from django.utils.module_loading import autodiscover_modules
autodiscover_modules('ajax')
else:
import imp
from django.conf import settings
from django.utils.importlib import import_module

try:
app_path = import_module(app).__path__
except AttributeError:
continue
for app in settings.INSTALLED_APPS:
try:
app_path = import_module(app).__path__
except AttributeError:
continue

try:
imp.find_module('ajax', app_path)
except ImportError:
continue
try:
imp.find_module('ajax', app_path)
except ImportError:
continue

import_module("%s.ajax" % app)
import_module("%s.ajax" % app)

LOADING_DAJAXICE = False