From 9af56803f53a4e41bb826d4e293ef8650ad9f13a Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Tue, 23 Dec 2008 18:25:24 +0000 Subject: Fixed #8245 -- Added a LOADING flag to autodiscover to prevent an admin.py module with errors from raising a spurious AlreadyRegistered exception in a subsequent call to autodiscover. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9680 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/__init__.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'django/contrib/admin/__init__.py') diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index 8396ffc6b3..bb856a1241 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -2,12 +2,26 @@ 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 +# A flag to tell us if autodiscover is running. autodiscover will set this to +# True while running, and False when it finishes. +LOADING = False + def autodiscover(): """ - Auto-discover INSTALLED_APPS admin.py modules and fail silently when + 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 may want. """ + # Bail out if autodiscover didn't finish loading from a previous call so + # that we avoid running autodiscover again when the URLConf is loaded by + # the exception handler to resolve the handler500 view. This prevents an + # admin.py module with errors from re-registering models and raising a + # spurious AlreadyRegistered exception (see #8245). + global LOADING + if LOADING: + return + LOADING = True + import imp from django.conf import settings @@ -38,3 +52,5 @@ def autodiscover(): # Step 3: import the app's admin file. If this has errors we want them # to bubble up. __import__("%s.admin" % app) + # autodiscover was successful, reset loading flag. + LOADING = False -- cgit v1.3