diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2010-04-14 19:10:27 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2010-04-14 19:10:27 +0000 |
| commit | 48dd5f13a351048d40803cbb95e60ed775d980cd (patch) | |
| tree | 783277b6ddcdbf9199691ea7224d73bd078677a7 /tests/regressiontests/admin_scripts/complex_app | |
| parent | d8910e95e02f3eae279691e33c0ad1a2442676a0 (diff) | |
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/trunk@12972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_scripts/complex_app')
6 files changed, 20 insertions, 0 deletions
diff --git a/tests/regressiontests/admin_scripts/complex_app/__init__.py b/tests/regressiontests/admin_scripts/complex_app/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/regressiontests/admin_scripts/complex_app/__init__.py diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py b/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py new file mode 100644 index 0000000000..1b933d028d --- /dev/null +++ b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py @@ -0,0 +1,3 @@ +from django.contrib import admin +from admin_scripts.complex_app.models.foo import Foo +admin.site.register(Foo) 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' |