From e608433ee76080a18f177f6e18a11de624d3f03d Mon Sep 17 00:00:00 2001 From: Brian Rosner Date: Fri, 1 Aug 2008 23:29:25 +0000 Subject: [PATCH] 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 --- django/contrib/admin/__init__.py | 6 ++++-- 1 file 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)