diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
| commit | d362c1546f8ad62811e5dee3cf0b43170e6e1c4c (patch) | |
| tree | c14af91e991cb534a135cc0ca467aa6263007b07 /tests/regressiontests/admin_scripts/complex_app | |
| parent | d5a45d79fe03cad93ab5761860e9bb6fc1db4c86 (diff) | |
Convert much of the regression tests to use absolute imports. There's still work to be done though.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_scripts/complex_app')
4 files changed, 14 insertions, 4 deletions
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py index 1b933d028d..1ed704a66b 100644 --- a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py +++ b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import + from django.contrib import admin -from admin_scripts.complex_app.models.foo import Foo + +from ..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 index a4d6d9539a..7b647e74b1 100644 --- a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py +++ b/tests/regressiontests/admin_scripts/complex_app/models/__init__.py @@ -1,4 +1,4 @@ -from admin_scripts.complex_app.models.bar import Bar -from admin_scripts.complex_app.models.foo import Foo +from .bar import Bar +from .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 index a5d8853fe4..15956f7a50 100644 --- a/tests/regressiontests/admin_scripts/complex_app/models/bar.py +++ b/tests/regressiontests/admin_scripts/complex_app/models/bar.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import + from django.db import models -from admin_scripts.complex_app.admin import foo +from ..admin import foo + + class Bar(models.Model): name = models.CharField(max_length=5) class Meta: diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/regressiontests/admin_scripts/complex_app/models/foo.py index 70c285e392..914cf3b8b5 100644 --- a/tests/regressiontests/admin_scripts/complex_app/models/foo.py +++ b/tests/regressiontests/admin_scripts/complex_app/models/foo.py @@ -1,5 +1,6 @@ from django.db import models + class Foo(models.Model): name = models.CharField(max_length=5) class Meta: |