Ticket #7922: 7922.diff

tests/regressiontests/admin_autodiscover/admin.py

@@ +1 @@
+raise ImportError('From inside admin.py')

tests/regressiontests/admin_autodiscover/tests.py

@@ +1 @@
+r"""
+>>> from django.contrib import admin
+>>> admin.autodiscover()
+Traceback (most recent call last):
+...
+ImportError: From inside admin.py
+"""

django/contrib/admin/__init__.py

@@ -8 +8 @@
     not present. This forces an import on them to register any admin bits they
     may want.
     """
+    from sys import exc_info
+    from traceback import extract_tb
     from django.conf import settings
     for app in settings.INSTALLED_APPS:
         try:
             __import__("%s.admin" % app)
         except ImportError:
-            pass
+            exc = exc_info()
+            if len(extract_tb(exc[-1], 2)) > 1:
+                raise