Author: adrian
Date: 2010-01-10 12:56:53 -0600 (Sun, 10 Jan 2010)
New Revision: 12192

Modified:
   django/trunk/django/contrib/admin/__init__.py
Log:
Fixed #10887 -- Fixed a possible gotcha in admin.autodiscover() by moving 
import_module() outside the try/except. Thanks, lsaffre

Modified: django/trunk/django/contrib/admin/__init__.py
===================================================================
--- django/trunk/django/contrib/admin/__init__.py       2010-01-10 18:55:04 UTC 
(rev 12191)
+++ django/trunk/django/contrib/admin/__init__.py       2010-01-10 18:56:53 UTC 
(rev 12192)
@@ -37,8 +37,9 @@
         # 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.
+        mod = import_module(app)
         try:
-            app_path = import_module(app).__path__
+            app_path = mod.__path__
         except AttributeError:
             continue
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.


Reply via email to