Author: jacob
Date: 2008-08-26 11:18:20 -0500 (Tue, 26 Aug 2008)
New Revision: 8583
Modified:
django/trunk/django/contrib/admin/__init__.py
Log:
Fixed #8126: improved `admin.autodiscover()` to be more forgiving of invalid
`INSTALLED_APPS` entries and/or exotic import schemes that don't have
`__path__`.
Modified: django/trunk/django/contrib/admin/__init__.py
===================================================================
--- django/trunk/django/contrib/admin/__init__.py 2008-08-26 15:52:21 UTC
(rev 8582)
+++ django/trunk/django/contrib/admin/__init__.py 2008-08-26 16:18:20 UTC
(rev 8583)
@@ -10,10 +10,31 @@
"""
import imp
from django.conf import settings
+
for app in settings.INSTALLED_APPS:
+ # For each app, we need to look for an admin.py inside that app's
+ # package. We can't use os.path here -- recall that modules may be
+ # imported different ways (think zip files) -- so we need to get
+ # the app's __path__ and look for admin.py on that path.
+
+ # Step 1: find out the app's __path__ Import errors here will (and
+ # should) bubble up, but a missing __path__ (which is legal, but weird)
+ # fails silently -- apps that do weird things with __path__ might
+ # need to roll their own admin registration.
try:
- imp.find_module("admin", __import__(app, {}, {},
[app.split(".")[-1]]).__path__)
+ app_path = __import__(app, {}, {}, [app.split('.')[-1]]).__path__
+ except AttributeError:
+ continue
+
+ # Step 2: use imp.find_module to find the app's admin.py. For some
+ # reason imp.find_module raises ImportError if the app can't be found
+ # but doesn't actually try to import the module. So skip this app if
+ # its admin.py doesn't exist
+ try:
+ imp.find_module('admin', app_path)
except ImportError:
- # there is no app admin.py, skip it
continue
+
+ # Step 3: import the app's admin file. If this has errors we want them
+ # to bubble up.
__import__("%s.admin" % app)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
