diff options
Diffstat (limited to 'django/contrib/admin/__init__.py')
| -rw-r--r-- | django/contrib/admin/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index 56b64faacb..704dc58ee4 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -8,9 +8,12 @@ def autodiscover(): not present. This forces an import on them to register any admin bits they may want. """ + import imp from django.conf import settings for app in settings.INSTALLED_APPS: try: - __import__("%s.admin" % app) + imp.find_module("admin", __import__(app, {}, {}, [app.split(".")[-1]]).__path__) except ImportError: - pass + # there is no app admin.py, skip it + continue + __import__("%s.admin" % app) |