Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #13335: Adjusted the r12950 fix to properly handle import error…

…s resulting from nested calls to load_app.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 48dd5f13a351048d40803cbb95e60ed775d980cd 1 parent d8910e9
Karen Tracey kmtracey authored
13 django/db/models/loading.py
View
@@ -75,16 +75,23 @@ def load_app(self, app_name, can_postpone=False):
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)
0  tests/regressiontests/admin_scripts/complex_app/__init__.py
View
No changes.
0  tests/regressiontests/admin_scripts/complex_app/admin/__init__.py
View
No changes.
3  tests/regressiontests/admin_scripts/complex_app/admin/foo.py
View
@@ -0,0 +1,3 @@
+from django.contrib import admin
+from admin_scripts.complex_app.models.foo import Foo
+admin.site.register(Foo)
4 tests/regressiontests/admin_scripts/complex_app/models/__init__.py
View
@@ -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']
7 tests/regressiontests/admin_scripts/complex_app/models/bar.py
View
@@ -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'
6 tests/regressiontests/admin_scripts/complex_app/models/foo.py
View
@@ -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'
0  tests/regressiontests/admin_scripts/simple_app/__init__.py
View
No changes.
1  tests/regressiontests/admin_scripts/simple_app/models.py
View
@@ -0,0 +1 @@
+from admin_scripts.complex_app.models.bar import Bar
14 tests/regressiontests/admin_scripts/tests.py
View
@@ -957,7 +957,7 @@ def test_custom_command_with_environment(self):
self.assertOutput(err, "Unknown command: 'noargs_command'")
-class ManageValidateImportErrorsReported(AdminScriptTestCase):
+class ManageValidate(AdminScriptTestCase):
def tearDown(self):
self.remove_settings('settings.py')
@@ -976,7 +976,17 @@ def test_broken_app(self):
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
Please sign in to comment.
Something went wrong with that request. Please try again.