Author: kmtracey
Date: 2010-04-15 18:18:33 -0500 (Thu, 15 Apr 2010)
New Revision: 12990
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/contrib/admin/__init__.py
Log:
[1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in
eggs. Thanks clint and metzen.
r12989 (and r12192 as a side-effect) from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11729,11732,11734,11739-11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12171,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12525-12526,12528,12533,12535,12537,12539,12541,12548,12551,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12710-12712,12719,12721,12723,12725-12726,12728,12733-12734,12737,12739,12741,12743,12757,12759,12764,12766,12768,12771,12774,12778,12780,12782,12788,12795,12798,12800,12806,12808,12811,12813,12817,12819,12821,12823,12825,12828,12830,12832,12834,12836,12838,12840,12842,12846,12848,12850,12852,12854,12858,12860,12862,12868,12878,12880,12883,12885,12891,12893,12896,12898,12901,12905,12908,12910,12912,12916,12918,12920,12924,12926,12928,12930,12932,12934,12941,12948,12950,12956,12971-12972,12974,12982,12984
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11729,11732,11734,11739-11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11921,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12171,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12525-12526,12528,12533,12535,12537,12539,12541,12548,12551,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12710-12712,12719,12721,12723,12725-12726,12728,12733-12734,12737,12739,12741,12743,12757,12759,12764,12766,12768,12771,12774,12778,12780,12782,12788,12795,12798,12800,12806,12808,12811,12813,12817,12819,12821,12823,12825,12828,12830,12832,12834,12836,12838,12840,12842,12846,12848,12850,12852,12854,12858,12860,12862,12868,12878,12880,12883,12885,12891,12893,12896,12898,12901,12905,12908,12910,12912,12916,12918,12920,12924,12926,12928,12930,12932,12934,12941,12948,12950,12956,12971-12972,12974,12982,12984,12989
Modified: django/branches/releases/1.1.X/django/contrib/admin/__init__.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/__init__.py
2010-04-15 22:32:53 UTC (rev 12989)
+++ django/branches/releases/1.1.X/django/contrib/admin/__init__.py
2010-04-15 23:18:33 UTC (rev 12990)
@@ -2,7 +2,6 @@
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
-from django.utils.importlib import import_module
def autodiscover():
@@ -13,36 +12,14 @@
"""
import copy
- import imp
from django.conf import settings
+ from django.utils.importlib import import_module
+ from django.utils.module_loading import module_has_submodule
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
- # imported different ways (think zip files) -- so we need to get
- # the app's __path__ and look for admin.py on that path.
-
- # Step 1: find out the app's __path__ Import errors here will (and
- # should) bubble up, but a missing __path__ (which is legal, but weird)
- # fails silently -- apps that do weird things with __path__ might
- # need to roll their own admin registration.
+ mod = import_module(app)
+ # Attempt to import the app's admin module.
try:
- app_path = import_module(app).__path__
- except AttributeError:
- continue
-
- # Step 2: use imp.find_module to find the app's admin.py. For some
- # reason imp.find_module raises ImportError if the app can't be found
- # but doesn't actually try to import the module. So skip this app if
- # its admin.py doesn't exist
- try:
- imp.find_module('admin', app_path)
- except ImportError:
- continue
-
- # Step 3: import the app's admin file. If this has errors we want them
- # to bubble up.
- try:
before_import_registry = copy.copy(site._registry)
import_module('%s.admin' % app)
except:
@@ -51,4 +28,9 @@
# could raise NotRegistered and AlreadyRegistered exceptions
# (see #8245).
site._registry = before_import_registry
- raise
+
+ # Decide whether to bubble up this error. If the app just
+ # doesn't have an admin module, we can ignore the error
+ # attempting to import it, otherwise we want it to bubble up.
+ if module_has_submodule(mod, 'admin'):
+ raise
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
