diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 21:34:56 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 21:34:56 +0000 |
| commit | 8c0eefd066aa0e5bfe8c1006d055be8e2ad69a2b (patch) | |
| tree | bded379649862a6b9c28553bc5130da524aac209 /tests/regressiontests/generic_inline_admin | |
| parent | f830166167833cfb7c990764f72373a9f4494259 (diff) | |
Convert the remainder of the relative imports in the tests to be absolute imports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/generic_inline_admin')
4 files changed, 12 insertions, 5 deletions
diff --git a/tests/regressiontests/generic_inline_admin/admin.py b/tests/regressiontests/generic_inline_admin/admin.py index 87224edab7..73cac7f7c5 100644 --- a/tests/regressiontests/generic_inline_admin/admin.py +++ b/tests/regressiontests/generic_inline_admin/admin.py @@ -1,9 +1,12 @@ +from __future__ import absolute_import + from django.contrib import admin from django.contrib.contenttypes import generic -from models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact, +from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact, Category, EpisodePermanent, EpisodeMaxNum) + site = admin.AdminSite(name="admin") class MediaInline(generic.GenericTabularInline): diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/regressiontests/generic_inline_admin/models.py index e78f110416..b9426b4f2a 100644 --- a/tests/regressiontests/generic_inline_admin/models.py +++ b/tests/regressiontests/generic_inline_admin/models.py @@ -1,6 +1,6 @@ -from django.db import models from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType +from django.db import models class Episode(models.Model): diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py index baea85717b..2c82acfd01 100644 --- a/tests/regressiontests/generic_inline_admin/tests.py +++ b/tests/regressiontests/generic_inline_admin/tests.py @@ -1,5 +1,7 @@ # coding: utf-8 +from __future__ import absolute_import + from django.conf import settings from django.contrib import admin from django.contrib.admin.sites import AdminSite @@ -9,9 +11,9 @@ from django.forms.models import ModelForm from django.test import TestCase # local test models -from models import (Episode, EpisodeExtra, EpisodeMaxNum, Media, +from .admin import MediaInline, MediaPermanentInline +from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media, EpisodePermanent, Category) -from admin import MediaInline, MediaPermanentInline class GenericAdminViewTest(TestCase): diff --git a/tests/regressiontests/generic_inline_admin/urls.py b/tests/regressiontests/generic_inline_admin/urls.py index 03431d3226..88d7b574d4 100644 --- a/tests/regressiontests/generic_inline_admin/urls.py +++ b/tests/regressiontests/generic_inline_admin/urls.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, include -import admin +from . import admin urlpatterns = patterns('', (r'^generic_inline_admin/admin/', include(admin.site.urls)), |