From 85af2641125dfdd141f744f37be616499108ace9 Mon Sep 17 00:00:00 2001 From: Brian Rosner Date: Fri, 1 Aug 2008 22:46:15 +0000 Subject: [PATCH] Reverted [8174]. It is causing some serious breakage right now. Need to investigate more. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8183 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index ef3b40af33..56b64faacb 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -8,12 +8,9 @@ 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: - imp.find_module("admin", app.split(".")) + __import__("%s.admin" % app) except ImportError: - # there is no admin.py in app, skip it. - continue - __import__("%s.admin" % app) + pass