Author: kmtracey
Date: 2010-04-14 14:10:27 -0500 (Wed, 14 Apr 2010)
New Revision: 12972
Added:
django/trunk/tests/regressiontests/admin_scripts/complex_app/
django/trunk/tests/regressiontests/admin_scripts/complex_app/__init__.py
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
django/trunk/tests/regressiontests/admin_scripts/simple_app/
django/trunk/tests/regressiontests/admin_scripts/simple_app/__init__.py
django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
Modified:
django/trunk/django/db/models/loading.py
django/trunk/tests/regressiontests/admin_scripts/tests.py
Log:
Fixed #13335: Adjusted the r12950 fix to properly handle import errors
resulting from nested calls to load_app.
Modified: django/trunk/django/db/models/loading.py
===================================================================
--- django/trunk/django/db/models/loading.py 2010-04-14 18:17:44 UTC (rev
12971)
+++ django/trunk/django/db/models/loading.py 2010-04-14 19:10:27 UTC (rev
12972)
@@ -75,16 +75,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)
Added: django/trunk/tests/regressiontests/admin_scripts/complex_app/__init__.py
===================================================================
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
===================================================================
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added: django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
2010-04-14 19:10:27 UTC (rev 12972)
@@ -0,0 +1,3 @@
+from django.contrib import admin
+from admin_scripts.complex_app.models.foo import Foo
+admin.site.register(Foo)
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
===================================================================
---
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
(rev 0)
+++
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
2010-04-14 19:10:27 UTC (rev 12972)
@@ -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']
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
2010-04-14 19:10:27 UTC (rev 12972)
@@ -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'
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/bar.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
2010-04-14 19:10:27 UTC (rev 12972)
@@ -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'
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/complex_app/models/foo.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added: django/trunk/tests/regressiontests/admin_scripts/simple_app/__init__.py
===================================================================
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/simple_app/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added: django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
2010-04-14 19:10:27 UTC (rev 12972)
@@ -0,0 +1 @@
+from admin_scripts.complex_app.models.bar import Bar
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/simple_app/models.py
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2010-04-14
18:17:44 UTC (rev 12971)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2010-04-14
19:10:27 UTC (rev 12972)
@@ -957,7 +957,7 @@
self.assertOutput(err, "Unknown command: 'noargs_command'")
-class ManageValidateImportErrorsReported(AdminScriptTestCase):
+class ManageValidate(AdminScriptTestCase):
def tearDown(self):
self.remove_settings('settings.py')
@@ -976,8 +976,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.
