Author: kmtracey
Date: 2010-04-14 14:14:23 -0500 (Wed, 14 Apr 2010)
New Revision: 12973
Added:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
Removed:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/__init__.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/db/models/loading.py
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/tests.py
Log:
[1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors
resulting from nested calls to load_app.
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
+
/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,12972
Modified: django/branches/releases/1.1.X/django/db/models/loading.py
===================================================================
--- django/branches/releases/1.1.X/django/db/models/loading.py 2010-04-14
19:10:27 UTC (rev 12972)
+++ django/branches/releases/1.1.X/django/db/models/loading.py 2010-04-14
19:14:23 UTC (rev 12973)
@@ -74,16 +74,23 @@
app_module = import_module(app_name)
try:
imp.find_module('models', app_module.__path__)
+ except ImportError:
+ self.nesting_level -= 1
+ # App has no models module, that's not a problem.
+ return None
+ try:
+ models = import_module('.models', app_name)
except ImportError:
self.nesting_level -= 1
if can_postpone:
- # Either the app has no models, or the package is still being
+ # Either the app has an error, or the package is still being
# imported by Python and the model module isn't available yet.
# We will check again once all the recursion has finished (in
# populate).
self.postponed.append(app_name)
- return None
- models = import_module('.models', app_name)
+ return None
+ else:
+ raise
self.nesting_level -= 1
if models not in self.app_store:
self.app_store[models] = len(self.app_store)
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app
(from rev 12972, django/trunk/tests/regressiontests/admin_scripts/complex_app)
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/__init__.py
===================================================================
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/__init__.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/__init__.py)
===================================================================
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin)
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
===================================================================
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py)
===================================================================
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
2010-04-14 19:10:27 UTC (rev 12972)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -1,3 +0,0 @@
-from django.contrib import admin
-from admin_scripts.complex_app.models.foo import Foo
-admin.site.register(Foo)
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py)
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
(rev 0)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -0,0 +1,3 @@
+from django.contrib import admin
+from admin_scripts.complex_app.models.foo import Foo
+admin.site.register(Foo)
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/models)
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
===================================================================
---
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
2010-04-14 19:10:27 UTC (rev 12972)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -1,4 +0,0 @@
-from admin_scripts.complex_app.models.bar import Bar
-from admin_scripts.complex_app.models.foo import Foo
-
-__all__ = ['Foo', 'Bar']
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py)
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
(rev 0)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -0,0 +1,4 @@
+from admin_scripts.complex_app.models.bar import Bar
+from admin_scripts.complex_app.models.foo import Foo
+
+__all__ = ['Foo', 'Bar']
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
2010-04-14 19:10:27 UTC (rev 12972)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -1,7 +0,0 @@
-from django.db import models
-
-from ..admin import foo
-class Bar(models.Model):
- name = models.CharField(max_length=5)
- class Meta:
- app_label = 'complex_app'
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py)
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
(rev 0)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/bar.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -0,0 +1,7 @@
+from django.db import models
+
+from ..admin import foo
+class Bar(models.Model):
+ name = models.CharField(max_length=5)
+ class Meta:
+ app_label = 'complex_app'
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
2010-04-14 19:10:27 UTC (rev 12972)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -1,6 +0,0 @@
-from django.db import models
-
-class Foo(models.Model):
- name = models.CharField(max_length=5)
- class Meta:
- app_label = 'complex_app'
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py)
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
(rev 0)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/complex_app/models/foo.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -0,0 +1,6 @@
+from django.db import models
+
+class Foo(models.Model):
+ name = models.CharField(max_length=5)
+ class Meta:
+ app_label = 'complex_app'
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app
(from rev 12972, django/trunk/tests/regressiontests/admin_scripts/simple_app)
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/__init__.py
===================================================================
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/__init__.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/simple_app/__init__.py)
===================================================================
Deleted:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
2010-04-14 19:10:27 UTC (rev 12972)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -1 +0,0 @@
-from admin_scripts.complex_app.models.bar import Bar
Copied:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
(from rev 12972,
django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py)
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
(rev 0)
+++
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/simple_app/models.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -0,0 +1 @@
+from admin_scripts.complex_app.models.bar import Bar
Modified:
django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/tests.py
2010-04-14 19:10:27 UTC (rev 12972)
+++ django/branches/releases/1.1.X/tests/regressiontests/admin_scripts/tests.py
2010-04-14 19:14:23 UTC (rev 12973)
@@ -958,7 +958,7 @@
self.assertOutput(err, "Unknown command: 'noargs_command'")
-class ManageValidateImportErrorsReported(AdminScriptTestCase):
+class ManageValidate(AdminScriptTestCase):
def tearDown(self):
self.remove_settings('settings.py')
@@ -977,8 +977,18 @@
out, err = self.run_manage(args)
self.assertNoOutput(out)
self.assertOutput(err, 'ImportError')
-
+ def test_complex_app(self):
+ "manage.py validate does not raise an ImportError validating a complex
app with nested calls to load_app"
+ self.write_settings('settings.py',
+ apps=['admin_scripts.complex_app', 'admin_scripts.simple_app'],
+ sdict={'DEBUG': True})
+ args = ['validate']
+ out, err = self.run_manage(args)
+ self.assertNoOutput(err)
+ self.assertOutput(out, '0 errors found')
+
+
##########################################################################
# COMMAND PROCESSING TESTS
# Check that user-space commands are correctly handled - in particular,
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
