diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-08-01 23:29:25 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-08-01 23:29:25 +0000 |
| commit | e608433ee76080a18f177f6e18a11de624d3f03d (patch) | |
| tree | 2356620eec9282d754e659cde68bd9f25bf559d1 /django/contrib/admin | |
| parent | 2db4b134809e162a6aa142300a1df14638eeae94 (diff) | |
Pass the correct data as the second parameter to find_module to correct admin.autodiscover(). Fixes #7922. Thanks Alex Gaynor for being smarter than me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin')
| -rw-r--r-- | django/contrib/admin/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index 56b64faacb..17639f0e7c 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -11,6 +11,8 @@ def autodiscover(): from django.conf import settings for app in settings.INSTALLED_APPS: try: - __import__("%s.admin" % app) + imp.find_module("admin", __import__(app, fromlist=[app.split(".")[-1]]).__path__) except ImportError: - pass + # there is no app admin.py, skip it + continue + __import__("%s.admin" % app) |