[1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 17 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py b/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
new file mode 100644
index 0000000000..a4d6d9539a
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
@@ -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']
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/bar.py b/tests/regressiontests/admin_scripts/complex_app/models/bar.py
new file mode 100644
index 0000000000..1da16f8f65
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/complex_app/models/bar.py
@@ -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'
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/regressiontests/admin_scripts/complex_app/models/foo.py
new file mode 100644
index 0000000000..70c285e392
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/complex_app/models/foo.py
@@ -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'