Ticket #8572: autodiscover_improvement_r8596.diff

django/contrib/redirects/admin.py

@@ -8 +8 @@
     search_fields = ('old_path', 'new_path')
     radio_fields = {'site': admin.VERTICAL}
 
-admin.site.register(Redirect, RedirectAdmin)
- Sin fin-de-línea al final del archivo
+def register(site):
+    site.register(Redirect, RedirectAdmin)
+ Sin fin-de-línea al final del archivo

django/contrib/comments/admin.py

@@ -21 +21 @@
     date_hierarchy = 'submit_date'
     search_fields = ('comment', 'user__username', 'user_name', 'user_email', 'user_url', 'ip_address')
 
-admin.site.register(Comment, CommentsAdmin)
+def register(site):
+    site.register(Comment, CommentsAdmin)

django/contrib/admin/__init__.py

@@ -2 +2 @@
 from django.contrib.admin.options import StackedInline, TabularInline
 from django.contrib.admin.sites import AdminSite, site
 
-def autodiscover():
+def autodiscover(admin_site=None):
     """
     Auto-discover INSTALLED_APPS admin.py modules and fail silently when 
     not present. This forces an import on them to register any admin bits they
@@ -11 +11 @@
     import imp
     from django.conf import settings
 
+    if admin_site is None:
+        admin_site = site
+
     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
@@ -37 +40 @@
 
         # Step 3: import the app's admin file. If this has errors we want them
         # to bubble up.
-        __import__("%s.admin" % app)
+        mod = __import__('%s.admin' % app, {}, {}, app.split('.'))
+
+        # Step 4: look for register function and call it, passing admin site
+        # as parameter
+        register_func = getattr(mod, 'register', None)
+        if register_func is not None and callable(register_func):
+            register_func(admin_site)

django/contrib/auth/admin.py

@@ -107 +107 @@
         }, context_instance=RequestContext(request))
 
 
-admin.site.register(Group, GroupAdmin)
-admin.site.register(User, UserAdmin)
+def register(site):
+    site.register(Group, GroupAdmin)
+    site.register(User, UserAdmin)
 

django/contrib/flatpages/admin.py

@@ -25 +25 @@
     list_filter = ('sites', 'enable_comments', 'registration_required')
     search_fields = ('url', 'title')
 
-admin.site.register(FlatPage, FlatPageAdmin)
+def register(site):
+    site.register(FlatPage, FlatPageAdmin)