Ticket #9427: admin_autodiscover_impfix2.patch

django/contrib/admin/__init__.py

@@ -25 +25 @@
             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
+            
+        # Import the app's admin file. If this has errors we want them
+        # to bubble up.  Import first because imp.find_module seems to have
+        # problems finding files inside of eggs.
         try:
-            imp.find_module('admin', app_path)
+            __import__("%s.admin" % app)
         except ImportError:
-            continue
-
-        # Step 3: import the app's admin file. If this has errors we want them
-        # to bubble up.
-        __import__("%s.admin" % app)
+            # If we could not import the admin file, see if it exsits
+            try:
+                imp.find_module('admin', app_path)
+                # Raise hell
+                raise
+            except ImportError:
+                # If the file couldn't be imported and doesn't exist just move on.
+                continue