1
0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00

Fixed #11957 -- exceptions in admin.py are no longer hidden after second request

Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2010-04-12 14:36:48 +00:00
parent 2cebe4395e
commit 2a752edd80
2 changed files with 21 additions and 18 deletions

View File

@ -4,9 +4,6 @@ from django.contrib.admin.options import StackedInline, TabularInline
from django.contrib.admin.sites import AdminSite, site
from django.utils.importlib import import_module
# 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():
"""
@ -14,16 +11,8 @@ def autodiscover():
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 copy
import imp
from django.conf import settings
@ -54,6 +43,13 @@ def autodiscover():
# Step 3: import the app's admin file. If this has errors we want them
# to bubble up.
import_module("%s.admin" % app)
# autodiscover was successful, reset loading flag.
LOADING = False
try:
before_import_registry = copy.copy(site._registry)
import_module('%s.admin' % app)
except:
# Reset the model registry to the state before the last import as
# this import will have to reoccur on the next request and this
# could raise NotRegistered and AlreadyRegistered exceptions
# (see #8245).
site._registry = before_import_registry
raise

View File

@ -18,6 +18,13 @@ class Bug8245Test(TestCase):
else:
self.fail(
'autodiscover should have raised a "Bad admin module" error.')
# Calling autodiscover again should bail out early and not raise an
# AlreadyRegistered error.
admin.autodiscover()
# Calling autodiscover again should raise the very same error it did
# the first time, not an AlreadyRegistered error.
try:
admin.autodiscover()
except Exception, e:
self.failUnlessEqual(str(e), "Bad admin module")
else:
self.fail(
'autodiscover should have raised a "Bad admin module" error.')