Ticket #7922: autodiscover_getattr_import_option_1.diff

django/contrib/admin/__init__.py

@@ +1 @@
+from django.utils.importutils import getattr_import, module_or_none
 from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
 from django.contrib.admin.options import StackedInline, TabularInline
 from django.contrib.admin.sites import AdminSite, site
@@ -10 +11 @@
     """
     from django.conf import settings
     for app in settings.INSTALLED_APPS:
-        try:
-            __import__("%s.admin" % app)
-        except ImportError:
-            pass
+        mod = module_or_none(app)
+        if mod:
+            try:
+                imp.find_module('admin', mod.__path__)
+            except ImportError:
+                # There is no admin.py, skip it 
+                continue
+        else:
+            continue 
+        getattr_import('%s.admin' % app) 

new file django/utils/importutils.py

@@ +1 @@
+def getattr_import(module_name):
+    components = module_name.split('.') 
+    mod = __import__(module_name) 
+    for comp in components[1:]: 
+        mod = getattr(mod, comp)
+
+def module_or_none(module_name):
+    try:
+        return getattr_import(module_name)
+    except (ImportError, AttributeError):
+        return None
+        
+