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 | |
| parent | f830166167833cfb7c990764f72373a9f4494259 (diff) | |
| download | django-8c0eefd066aa0e5bfe8c1006d055be8e2ad69a2b.tar.gz | |
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
144 files changed, 576 insertions, 261 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)), diff --git a/tests/regressiontests/generic_relations_regress/models.py b/tests/regressiontests/generic_relations_regress/models.py index d28385d398..7ec752b02b 100644 --- a/tests/regressiontests/generic_relations_regress/models.py +++ b/tests/regressiontests/generic_relations_regress/models.py @@ -1,9 +1,10 @@ -from django.db import models from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType +from django.db import models + -__all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address', - 'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2', +__all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address', + 'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2', 'Contact', 'Organization', 'Note') class Link(models.Model): diff --git a/tests/regressiontests/generic_relations_regress/tests.py b/tests/regressiontests/generic_relations_regress/tests.py index 52731a9a43..4c0f024433 100644 --- a/tests/regressiontests/generic_relations_regress/tests.py +++ b/tests/regressiontests/generic_relations_regress/tests.py @@ -1,6 +1,9 @@ -from django.test import TestCase from django.db.models import Q -from models import * +from django.test import TestCase + +from .models import (Address, Place, Restaurant, Link, CharLink, TextLink, + Person, Contact, Note, Organization, OddRelation1, OddRelation2) + class GenericRelationTests(TestCase): diff --git a/tests/regressiontests/generic_views/base.py b/tests/regressiontests/generic_views/base.py index 00fa0d9b79..d9debb6627 100644 --- a/tests/regressiontests/generic_views/base.py +++ b/tests/regressiontests/generic_views/base.py @@ -1,9 +1,9 @@ import time -import unittest from django.core.exceptions import ImproperlyConfigured from django.http import HttpResponse from django.test import TestCase, RequestFactory +from django.utils import unittest from django.views.generic import View, TemplateView, RedirectView diff --git a/tests/regressiontests/generic_views/dates.py b/tests/regressiontests/generic_views/dates.py index a0dd867e71..5e03dbe806 100644 --- a/tests/regressiontests/generic_views/dates.py +++ b/tests/regressiontests/generic_views/dates.py @@ -1,9 +1,12 @@ +from __future__ import absolute_import + import datetime from django.core.exceptions import ImproperlyConfigured from django.test import TestCase -from regressiontests.generic_views.models import Book +from .models import Book + class ArchiveIndexViewTests(TestCase): fixtures = ['generic-views-test-data.json'] diff --git a/tests/regressiontests/generic_views/detail.py b/tests/regressiontests/generic_views/detail.py index c1cc2fbddb..0b5d8737dd 100644 --- a/tests/regressiontests/generic_views/detail.py +++ b/tests/regressiontests/generic_views/detail.py @@ -1,7 +1,9 @@ +from __future__ import absolute_import + from django.core.exceptions import ImproperlyConfigured from django.test import TestCase -from regressiontests.generic_views.models import Artist, Author, Page +from .models import Artist, Author, Page class DetailViewTest(TestCase): diff --git a/tests/regressiontests/generic_views/edit.py b/tests/regressiontests/generic_views/edit.py index 0adcb15afa..182615a86b 100644 --- a/tests/regressiontests/generic_views/edit.py +++ b/tests/regressiontests/generic_views/edit.py @@ -1,11 +1,14 @@ +from __future__ import absolute_import + from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import reverse from django import forms from django.test import TestCase from django.utils.unittest import expectedFailure -from regressiontests.generic_views.models import Artist, Author -from regressiontests.generic_views import views +from . import views +from .models import Artist, Author + class ModelFormMixinTests(TestCase): def test_get_form(self): diff --git a/tests/regressiontests/generic_views/forms.py b/tests/regressiontests/generic_views/forms.py index 7200947781..a78242f555 100644 --- a/tests/regressiontests/generic_views/forms.py +++ b/tests/regressiontests/generic_views/forms.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django import forms -from regressiontests.generic_views.models import Author +from .models import Author class AuthorForm(forms.ModelForm): diff --git a/tests/regressiontests/generic_views/list.py b/tests/regressiontests/generic_views/list.py index f5bf910894..9ad00edc3b 100644 --- a/tests/regressiontests/generic_views/list.py +++ b/tests/regressiontests/generic_views/list.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import + from django.core.exceptions import ImproperlyConfigured from django.test import TestCase -from regressiontests.generic_views.models import Author, Artist +from .models import Author, Artist + class ListViewTests(TestCase): fixtures = ['generic-views-test-data.json'] diff --git a/tests/regressiontests/generic_views/models.py b/tests/regressiontests/generic_views/models.py index 5445e24cee..5977258f5f 100644 --- a/tests/regressiontests/generic_views/models.py +++ b/tests/regressiontests/generic_views/models.py @@ -1,5 +1,6 @@ from django.db import models + class Artist(models.Model): name = models.CharField(max_length=100) diff --git a/tests/regressiontests/generic_views/tests.py b/tests/regressiontests/generic_views/tests.py index a4010aa7c9..d387216d41 100644 --- a/tests/regressiontests/generic_views/tests.py +++ b/tests/regressiontests/generic_views/tests.py @@ -1,5 +1,10 @@ -from regressiontests.generic_views.base import ViewTest, TemplateViewTest, RedirectViewTest -from regressiontests.generic_views.dates import ArchiveIndexViewTests, YearArchiveViewTests, MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests, DateDetailViewTests -from regressiontests.generic_views.detail import DetailViewTest -from regressiontests.generic_views.edit import ModelFormMixinTests, CreateViewTests, UpdateViewTests, DeleteViewTests -from regressiontests.generic_views.list import ListViewTests +from __future__ import absolute_import + +from .base import ViewTest, TemplateViewTest, RedirectViewTest +from .dates import (ArchiveIndexViewTests, YearArchiveViewTests, + MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests, + DateDetailViewTests) +from .detail import DetailViewTest +from .edit import (ModelFormMixinTests, CreateViewTests, UpdateViewTests, + DeleteViewTests) +from .list import ListViewTests diff --git a/tests/regressiontests/generic_views/urls.py b/tests/regressiontests/generic_views/urls.py index c5c63eec25..090ec73c4a 100644 --- a/tests/regressiontests/generic_views/urls.py +++ b/tests/regressiontests/generic_views/urls.py @@ -1,8 +1,10 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url -from django.views.generic import TemplateView from django.views.decorators.cache import cache_page +from django.views.generic import TemplateView -import views +from . import views urlpatterns = patterns('', diff --git a/tests/regressiontests/generic_views/views.py b/tests/regressiontests/generic_views/views.py index 00d00219a4..5ff9cf0e65 100644 --- a/tests/regressiontests/generic_views/views.py +++ b/tests/regressiontests/generic_views/views.py @@ -1,11 +1,13 @@ +from __future__ import absolute_import + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.core.urlresolvers import reverse from django.utils.decorators import method_decorator from django.views import generic -from regressiontests.generic_views.models import Artist, Author, Book, Page -from regressiontests.generic_views.forms import AuthorForm +from .forms import AuthorForm +from .models import Artist, Author, Book, Page class CustomTemplateView(generic.TemplateView): diff --git a/tests/regressiontests/get_or_create_regress/tests.py b/tests/regressiontests/get_or_create_regress/tests.py index 103e254d4c..92c371b6f8 100644 --- a/tests/regressiontests/get_or_create_regress/tests.py +++ b/tests/regressiontests/get_or_create_regress/tests.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.test import TestCase -from models import Author, Publisher +from .models import Author, Publisher class GetOrCreateTests(TestCase): diff --git a/tests/regressiontests/handlers/tests.py b/tests/regressiontests/handlers/tests.py index 40b0a8375a..59d3d84528 100644 --- a/tests/regressiontests/handlers/tests.py +++ b/tests/regressiontests/handlers/tests.py @@ -1,7 +1,7 @@ -from django.utils import unittest from django.conf import settings from django.core.handlers.wsgi import WSGIHandler from django.test import RequestFactory +from django.utils import unittest class HandlerTests(unittest.TestCase): diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py index 81065564c7..7513c46a8f 100644 --- a/tests/regressiontests/httpwrappers/tests.py +++ b/tests/regressiontests/httpwrappers/tests.py @@ -5,6 +5,7 @@ from django.http import (QueryDict, HttpResponse, SimpleCookie, BadHeaderError, parse_cookie) from django.utils import unittest + class QueryDictTests(unittest.TestCase): def test_missing_key(self): q = QueryDict('') diff --git a/tests/regressiontests/i18n/commands/compilation.py b/tests/regressiontests/i18n/commands/compilation.py index 44bb2f6ab4..98b4b33356 100644 --- a/tests/regressiontests/i18n/commands/compilation.py +++ b/tests/regressiontests/i18n/commands/compilation.py @@ -8,8 +8,8 @@ from django.core.management import CommandError from django.core.management.commands.compilemessages import compile_messages from django.test import TestCase -LOCALE='es_AR' +LOCALE='es_AR' class MessageCompilationTests(TestCase): diff --git a/tests/regressiontests/i18n/commands/extraction.py b/tests/regressiontests/i18n/commands/extraction.py index 4f476340f2..7d7cdf7485 100644 --- a/tests/regressiontests/i18n/commands/extraction.py +++ b/tests/regressiontests/i18n/commands/extraction.py @@ -2,8 +2,10 @@ import os import re import shutil -from django.test import TestCase + from django.core import management +from django.test import TestCase + LOCALE='de' diff --git a/tests/regressiontests/i18n/contenttypes/tests.py b/tests/regressiontests/i18n/contenttypes/tests.py index eb5c1718fc..79928d9e4f 100644 --- a/tests/regressiontests/i18n/contenttypes/tests.py +++ b/tests/regressiontests/i18n/contenttypes/tests.py @@ -3,10 +3,10 @@ from __future__ import with_statement import os +from django.contrib.contenttypes.models import ContentType from django.test import TestCase from django.test.utils import override_settings from django.utils import translation -from django.contrib.contenttypes.models import ContentType class ContentTypeTests(TestCase): diff --git a/tests/regressiontests/i18n/forms.py b/tests/regressiontests/i18n/forms.py index 600f252aa5..b2eb74c74c 100644 --- a/tests/regressiontests/i18n/forms.py +++ b/tests/regressiontests/i18n/forms.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import + from django import forms from django.forms.extras import SelectDateWidget -from models import Company +from .models import Company + class I18nForm(forms.Form): decimal_field = forms.DecimalField(localize=True) diff --git a/tests/regressiontests/i18n/models.py b/tests/regressiontests/i18n/models.py index a302769fef..9b92705a20 100644 --- a/tests/regressiontests/i18n/models.py +++ b/tests/regressiontests/i18n/models.py @@ -1,7 +1,9 @@ from datetime import datetime + from django.db import models from django.utils.translation import ugettext_lazy as _ + class TestModel(models.Model): text = models.CharField(max_length=10, default=_('Anything')) diff --git a/tests/regressiontests/i18n/test_warnings.py b/tests/regressiontests/i18n/test_warnings.py index 60dd1a8c6f..8aac89d16c 100644 --- a/tests/regressiontests/i18n/test_warnings.py +++ b/tests/regressiontests/i18n/test_warnings.py @@ -1,5 +1,5 @@ -from os.path import join, normpath, abspath, dirname import warnings +from os.path import join, normpath, abspath, dirname import django from django.conf import settings diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index 68eafbf276..fc69d9cc59 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -1,5 +1,6 @@ # -*- encoding: utf-8 -*- -from __future__ import with_statement +from __future__ import with_statement, absolute_import + import datetime import decimal import os @@ -10,24 +11,24 @@ from django.conf import settings from django.template import Template, Context from django.test import TestCase, RequestFactory from django.test.utils import override_settings +from django.utils import translation from django.utils.formats import (get_format, date_format, time_format, localize, localize_input, iter_format_modules, get_format_modules) from django.utils.importlib import import_module from django.utils.numberformat import format as nformat from django.utils.safestring import mark_safe, SafeString, SafeUnicode -from django.utils import translation from django.utils.translation import (ugettext, ugettext_lazy, activate, - deactivate, gettext_lazy, pgettext, npgettext, to_locale, - get_language_info, get_language, get_language_from_request) + deactivate, gettext_lazy, pgettext, npgettext, to_locale, + get_language_info, get_language, get_language_from_request) -from forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm -from models import Company, TestModel +from .commands.tests import NoWrapExtractorTests, IgnoredExtractorTests, MessageCompilationTests, PoFileTests, BasicExtractorTests, JavascriptExtractorTests, CopyPluralFormsExtractorTests, SymlinkExtractorTests, ExtractorTests +from .contenttypes.tests import ContentTypeTests +from .forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm +from .models import Company, TestModel +from .patterns.tests import URLRedirectWithoutTrailingSlashTests, URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase, URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests, URLPrefixTests, URLResponseTests, URLRedirectTests +from .test_warnings import DeprecationWarningTests -from commands.tests import * -from patterns.tests import * -from contenttypes.tests import * -from test_warnings import DeprecationWarningTests here = os.path.dirname(os.path.abspath(__file__)) diff --git a/tests/regressiontests/initial_sql_regress/models.py b/tests/regressiontests/initial_sql_regress/models.py index 6c7db2f362..76de6d3bcb 100644 --- a/tests/regressiontests/initial_sql_regress/models.py +++ b/tests/regressiontests/initial_sql_regress/models.py @@ -4,6 +4,7 @@ Regression tests for initial SQL insertion. from django.db import models + class Simple(models.Model): name = models.CharField(max_length = 50) diff --git a/tests/regressiontests/initial_sql_regress/tests.py b/tests/regressiontests/initial_sql_regress/tests.py index 1e6710be9e..815b75a9bb 100644 --- a/tests/regressiontests/initial_sql_regress/tests.py +++ b/tests/regressiontests/initial_sql_regress/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase -from models import Simple +from .models import Simple class InitialSQLTests(TestCase): diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/regressiontests/inline_formsets/tests.py index b47967971a..59187ee6d0 100644 --- a/tests/regressiontests/inline_formsets/tests.py +++ b/tests/regressiontests/inline_formsets/tests.py @@ -1,7 +1,9 @@ +from __future__ import absolute_import + from django.forms.models import inlineformset_factory from django.test import TestCase -from regressiontests.inline_formsets.models import Poet, Poem, School, Parent, Child +from .models import Poet, Poem, School, Parent, Child class DeletionTests(TestCase): diff --git a/tests/regressiontests/introspection/models.py b/tests/regressiontests/introspection/models.py index ef485e3a3c..da12f6e5cb 100644 --- a/tests/regressiontests/introspection/models.py +++ b/tests/regressiontests/introspection/models.py @@ -1,5 +1,6 @@ from django.db import models + class Reporter(models.Model): first_name = models.CharField(max_length=30) last_name = models.CharField(max_length=30) diff --git a/tests/regressiontests/introspection/tests.py b/tests/regressiontests/introspection/tests.py index fdf30126cd..1835064fcd 100644 --- a/tests/regressiontests/introspection/tests.py +++ b/tests/regressiontests/introspection/tests.py @@ -1,8 +1,11 @@ +from __future__ import absolute_import + from functools import update_wrapper + from django.db import connection from django.test import TestCase, skipUnlessDBFeature -from models import Reporter, Article +from .models import Reporter, Article # # The introspection module is optional, so methods tested here might raise diff --git a/tests/regressiontests/localflavor/au/forms.py b/tests/regressiontests/localflavor/au/forms.py index e65b92438e..aec00694fe 100644 --- a/tests/regressiontests/localflavor/au/forms.py +++ b/tests/regressiontests/localflavor/au/forms.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.forms import ModelForm -from models import AustralianPlace + +from .models import AustralianPlace + class AustralianPlaceForm(ModelForm): """ Form for storing an Australian place. """ diff --git a/tests/regressiontests/localflavor/au/models.py b/tests/regressiontests/localflavor/au/models.py index 8adfa1f6f5..39061c5bb3 100644 --- a/tests/regressiontests/localflavor/au/models.py +++ b/tests/regressiontests/localflavor/au/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.contrib.localflavor.au.models import AUStateField, AUPostCodeField +from django.db import models class AustralianPlace(models.Model): state = AUStateField(blank=True) diff --git a/tests/regressiontests/localflavor/au/tests.py b/tests/regressiontests/localflavor/au/tests.py index bdfaa2b799..de74b1f2b9 100644 --- a/tests/regressiontests/localflavor/au/tests.py +++ b/tests/regressiontests/localflavor/au/tests.py @@ -1,10 +1,13 @@ +from __future__ import absolute_import + import re from django.test import SimpleTestCase from django.contrib.localflavor.au.forms import (AUPostCodeField, AUPhoneNumberField, AUStateSelect) -from forms import AustralianPlaceForm +from .forms import AustralianPlaceForm + SELECTED_OPTION_PATTERN = r'<option value="%s" selected="selected">' BLANK_OPTION_PATTERN = r'<option value="">' diff --git a/tests/regressiontests/localflavor/mk/forms.py b/tests/regressiontests/localflavor/mk/forms.py index 50fcf05f94..d41bee77de 100644 --- a/tests/regressiontests/localflavor/mk/forms.py +++ b/tests/regressiontests/localflavor/mk/forms.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.forms import ModelForm -from models import MKPerson + +from .models import MKPerson + class MKPersonForm(ModelForm): diff --git a/tests/regressiontests/localflavor/mk/models.py b/tests/regressiontests/localflavor/mk/models.py index 244f396b52..29a8f587de 100644 --- a/tests/regressiontests/localflavor/mk/models.py +++ b/tests/regressiontests/localflavor/mk/models.py @@ -1,6 +1,7 @@ -from django.db import models from django.contrib.localflavor.mk.models import ( MKIdentityCardNumberField, MKMunicipalityField, UMCNField) +from django.db import models + class MKPerson(models.Model): first_name = models.CharField(max_length = 20) diff --git a/tests/regressiontests/localflavor/mk/tests.py b/tests/regressiontests/localflavor/mk/tests.py index 754db2d93c..5d37a777a5 100644 --- a/tests/regressiontests/localflavor/mk/tests.py +++ b/tests/regressiontests/localflavor/mk/tests.py @@ -1,10 +1,13 @@ +from __future__ import absolute_import + from django.contrib.localflavor.mk.forms import ( MKIdentityCardNumberField, MKMunicipalitySelect, UMCNField) from django.test import SimpleTestCase -from forms import MKPersonForm +from .forms import MKPersonForm + -class MKLocalflavorTests(SimpleTestCase): +class MKLocalFlavorTests(SimpleTestCase): def setUp(self): self.form = MKPersonForm({ diff --git a/tests/regressiontests/localflavor/mx/forms.py b/tests/regressiontests/localflavor/mx/forms.py index 2669cd9ace..dac05319c8 100644 --- a/tests/regressiontests/localflavor/mx/forms.py +++ b/tests/regressiontests/localflavor/mx/forms.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.forms import ModelForm -from models import MXPersonProfile + +from .models import MXPersonProfile + class MXPersonProfileForm(ModelForm): diff --git a/tests/regressiontests/localflavor/mx/models.py b/tests/regressiontests/localflavor/mx/models.py index 9c32cf5cab..4905836d3d 100644 --- a/tests/regressiontests/localflavor/mx/models.py +++ b/tests/regressiontests/localflavor/mx/models.py @@ -1,6 +1,7 @@ -from django.db import models from django.contrib.localflavor.mx.models import ( MXStateField, MXRFCField, MXCURPField, MXZipCodeField) +from django.db import models + class MXPersonProfile(models.Model): state = MXStateField() diff --git a/tests/regressiontests/localflavor/mx/tests.py b/tests/regressiontests/localflavor/mx/tests.py index 892dc9dc1c..b5d696a38b 100644 --- a/tests/regressiontests/localflavor/mx/tests.py +++ b/tests/regressiontests/localflavor/mx/tests.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + from django.contrib.localflavor.mx.forms import (MXZipCodeField, MXRFCField, MXStateSelect, MXCURPField) from django.test import SimpleTestCase -from forms import MXPersonProfileForm +from .forms import MXPersonProfileForm + class MXLocalFlavorTests(SimpleTestCase): diff --git a/tests/regressiontests/localflavor/tests.py b/tests/regressiontests/localflavor/tests.py index 12c052bf2a..0062a4f925 100644 --- a/tests/regressiontests/localflavor/tests.py +++ b/tests/regressiontests/localflavor/tests.py @@ -1,42 +1,44 @@ -from ar.tests import * -from at.tests import * -from au.tests import * -from be.tests import * -from br.tests import * -from ca.tests import * -from ch.tests import * -from cl.tests import * -from cn.tests import * -from co.tests import * -from cz.tests import * -from de.tests import * -from ec.tests import * -from es.tests import * -from fi.tests import * -from fr.tests import * -from gb.tests import * -from generic.tests import * -from hr.tests import * -from id.tests import * -from ie.tests import * -from il.tests import * -from in_.tests import * -from is_.tests import * -from it.tests import * -from jp.tests import * -from kw.tests import * -from mk.tests import * -from mx.tests import * -from nl.tests import * -from pl.tests import * -from pt.tests import * -from py.tests import * -from ro.tests import * -from ru.tests import * -from se.tests import * -from si.tests import * -from sk.tests import * -from tr.tests import * -from us.tests import * -from uy.tests import * -from za.tests import * +from __future__ import absolute_import + +from .ar.tests import ARLocalFlavorTests +from .at.tests import ATLocalFlavorTests +from .au.tests import AULocalflavorTests +from .be.tests import BELocalFlavorTests +from .br.tests import BRLocalFlavorTests +from .ca.tests import CALocalFlavorTests +from .ch.tests import CHLocalFlavorTests +from .cl.tests import CLLocalFlavorTests +from .cn.tests import CNLocalFlavorTests +from .co.tests import COLocalFlavorTests +from .cz.tests import CZLocalFlavorTests +from .de.tests import DELocalFlavorTests +from .ec.tests import ECLocalFlavorTests +from .es.tests import ESLocalFlavorTests +from .fi.tests import FILocalFlavorTests +from .fr.tests import FRLocalFlavorTests +from .gb.tests import GBLocalFlavorTests +from .generic.tests import GenericLocalFlavorTests +from .hr.tests import HRLocalFlavorTests +from .id.tests import IDLocalFlavorTests +from .ie.tests import IELocalFlavorTests +from .il.tests import ILLocalFlavorTests +from .in_.tests import INLocalFlavorTests +from .is_.tests import ISLocalFlavorTests +from .it.tests import ITLocalFlavorTests +from .jp.tests import JPLocalFlavorTests +from .kw.tests import KWLocalFlavorTests +from .mk.tests import MKLocalFlavorTests +from .mx.tests import MXLocalFlavorTests +from .nl.tests import NLLocalFlavorTests +from .pl.tests import PLLocalFlavorTests +from .pt.tests import PTLocalFlavorTests +from .py.tests import PYLocalFlavorTests +from .ro.tests import ROLocalFlavorTests +from .ru.tests import RULocalFlavorTests +from .se.tests import SELocalFlavorTests +from .si.tests import SILocalFlavorTests +from .sk.tests import SKLocalFlavorTests +from .tr.tests import TRLocalFlavorTests +from .us.tests import USLocalFlavorTests +from .uy.tests import UYLocalFlavorTests +from .za.tests import ZALocalFlavorTests diff --git a/tests/regressiontests/localflavor/us/forms.py b/tests/regressiontests/localflavor/us/forms.py index 7730662f8c..fe925c3c7b 100644 --- a/tests/regressiontests/localflavor/us/forms.py +++ b/tests/regressiontests/localflavor/us/forms.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.forms import ModelForm -from models import USPlace + +from .models import USPlace + class USPlaceForm(ModelForm): diff --git a/tests/regressiontests/localflavor/us/models.py b/tests/regressiontests/localflavor/us/models.py index 4095f73532..ff48ed16bb 100644 --- a/tests/regressiontests/localflavor/us/models.py +++ b/tests/regressiontests/localflavor/us/models.py @@ -1,6 +1,5 @@ +from django.contrib.localflavor.us.models import USStateField, USPostalCodeField from django.db import models -from django.contrib.localflavor.us.models import USStateField -from django.contrib.localflavor.us.models import USPostalCodeField # When creating models you need to remember to add a app_label as # 'localflavor', so your model can be found diff --git a/tests/regressiontests/localflavor/us/tests.py b/tests/regressiontests/localflavor/us/tests.py index 758dc0bf32..b4762bf30b 100644 --- a/tests/regressiontests/localflavor/us/tests.py +++ b/tests/regressiontests/localflavor/us/tests.py @@ -1,11 +1,14 @@ +from __future__ import absolute_import + from django.contrib.localflavor.us.forms import (USZipCodeField, USPhoneNumberField, USStateField, USStateSelect, USSocialSecurityNumberField) from django.test import SimpleTestCase -from forms import USPlaceForm +from .forms import USPlaceForm + -class USLocalflavorTests(SimpleTestCase): +class USLocalFlavorTests(SimpleTestCase): def setUp(self): self.form = USPlaceForm({'state':'GA', 'state_req':'NC', 'postal_code': 'GA', 'name':'impossible'}) diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/regressiontests/logging_tests/tests.py index a213739951..a2c178c3b7 100644 --- a/tests/regressiontests/logging_tests/tests.py +++ b/tests/regressiontests/logging_tests/tests.py @@ -3,11 +3,11 @@ from __future__ import with_statement import copy from django.conf import compat_patch_logging_config +from django.core import mail from django.test import TestCase - -from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger from django.test.utils import override_settings -from django.core import mail +from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger + # logging config prior to using filter with mail_admins diff --git a/tests/regressiontests/m2m_regress/models.py b/tests/regressiontests/m2m_regress/models.py index 1c2126d76a..be8dcae9c1 100644 --- a/tests/regressiontests/m2m_regress/models.py +++ b/tests/regressiontests/m2m_regress/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.contrib.auth import models as auth +from django.db import models # No related name is needed here, since symmetrical relations are not # explicitly reversible. diff --git a/tests/regressiontests/m2m_regress/tests.py b/tests/regressiontests/m2m_regress/tests.py index 9ae888a6ce..e3dab59b9f 100644 --- a/tests/regressiontests/m2m_regress/tests.py +++ b/tests/regressiontests/m2m_regress/tests.py @@ -1,7 +1,9 @@ +from __future__ import absolute_import + from django.core.exceptions import FieldError from django.test import TestCase -from models import (SelfRefer, Tag, TagCollection, Entry, SelfReferChild, +from .models import (SelfRefer, Tag, TagCollection, Entry, SelfReferChild, SelfReferChildSibling, Worksheet) diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/regressiontests/m2m_through_regress/models.py index 9eea2f4604..ff71348931 100644 --- a/tests/regressiontests/m2m_through_regress/models.py +++ b/tests/regressiontests/m2m_through_regress/models.py @@ -1,6 +1,5 @@ -from django.db import models - from django.contrib.auth.models import User +from django.db import models # Forward declared intermediate model diff --git a/tests/regressiontests/m2m_through_regress/tests.py b/tests/regressiontests/m2m_through_regress/tests.py index fb2cb04d9b..1c188d05c3 100644 --- a/tests/regressiontests/m2m_through_regress/tests.py +++ b/tests/regressiontests/m2m_through_regress/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + try: from cStringIO import StringIO except ImportError: @@ -7,8 +9,8 @@ from django.core import management from django.contrib.auth.models import User from django.test import TestCase -from models import (Person, Group, Membership, UserMembership, - Car, Driver, CarDriver) +from .models import (Person, Group, Membership, UserMembership, Car, Driver, + CarDriver) class M2MThroughTestCase(TestCase): diff --git a/tests/regressiontests/managers_regress/models.py b/tests/regressiontests/managers_regress/models.py index 1e1b1c9981..fb6c530722 100644 --- a/tests/regressiontests/managers_regress/models.py +++ b/tests/regressiontests/managers_regress/models.py @@ -4,6 +4,7 @@ Various edge-cases for model managers. from django.db import models + class OnlyFred(models.Manager): def get_query_set(self): return super(OnlyFred, self).get_query_set().filter(name='fred') diff --git a/tests/regressiontests/managers_regress/tests.py b/tests/regressiontests/managers_regress/tests.py index 9a6db61418..dd6cb66857 100644 --- a/tests/regressiontests/managers_regress/tests.py +++ b/tests/regressiontests/managers_regress/tests.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.test import TestCase -from models import Child1, Child2, Child3, Child4, Child5, Child6, Child7 +from .models import Child1, Child2, Child3, Child4, Child5, Child6, Child7 class ManagersRegressionTests(TestCase): diff --git a/tests/regressiontests/many_to_one_regress/tests.py b/tests/regressiontests/many_to_one_regress/tests.py index 7d2a49cea5..9e04fb4542 100644 --- a/tests/regressiontests/many_to_one_regress/tests.py +++ b/tests/regressiontests/many_to_one_regress/tests.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import + from django.db import models from django.test import TestCase -from models import First, Second, Third, Parent, Child, Category, Record, Relation +from .models import First, Second, Third, Parent, Child, Category, Record, Relation + class ManyToOneRegressionTests(TestCase): def test_object_creation(self): diff --git a/tests/regressiontests/max_lengths/models.py b/tests/regressiontests/max_lengths/models.py index 78eb30c49f..d66e833e8c 100644 --- a/tests/regressiontests/max_lengths/models.py +++ b/tests/regressiontests/max_lengths/models.py @@ -1,5 +1,6 @@ from django.db import models + class PersonWithDefaultMaxLengths(models.Model): email = models.EmailField() vcard = models.FileField(upload_to='/tmp') diff --git a/tests/regressiontests/max_lengths/tests.py b/tests/regressiontests/max_lengths/tests.py index 4d1f2bff9a..9dfcabff45 100644 --- a/tests/regressiontests/max_lengths/tests.py +++ b/tests/regressiontests/max_lengths/tests.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django.utils import unittest -from regressiontests.max_lengths.models import PersonWithDefaultMaxLengths, PersonWithCustomMaxLengths +from .models import PersonWithDefaultMaxLengths, PersonWithCustomMaxLengths + class MaxLengthArgumentsTests(unittest.TestCase): diff --git a/tests/regressiontests/middleware_exceptions/urls.py b/tests/regressiontests/middleware_exceptions/urls.py index ae78a65468..042607fdc8 100644 --- a/tests/regressiontests/middleware_exceptions/urls.py +++ b/tests/regressiontests/middleware_exceptions/urls.py @@ -1,7 +1,9 @@ # coding: utf-8 +from __future__ import absolute_import + from django.conf.urls import patterns -import views +from . import views urlpatterns = patterns('', (r'^middleware_exceptions/view/$', views.normal_view), diff --git a/tests/regressiontests/model_fields/imagefield.py b/tests/regressiontests/model_fields/imagefield.py index c952aa981a..09c1bd76d3 100644 --- a/tests/regressiontests/model_fields/imagefield.py +++ b/tests/regressiontests/model_fields/imagefield.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import os import shutil @@ -5,14 +7,14 @@ from django.core.files import File from django.core.files.images import ImageFile from django.test import TestCase -from models import (Image, Person, PersonWithHeight, PersonWithHeightAndWidth, - PersonDimensionsFirst, PersonTwoImages, TestImageFieldFile) +from .models import (Image, Person, PersonWithHeight, PersonWithHeightAndWidth, + PersonDimensionsFirst, PersonTwoImages, TestImageFieldFile) # If PIL available, do these tests. if Image: - from models import temp_storage_dir + from .models import temp_storage_dir class ImageFieldTestMixin(object): diff --git a/tests/regressiontests/model_fields/tests.py b/tests/regressiontests/model_fields/tests.py index faa74cc05b..8fe67fb606 100644 --- a/tests/regressiontests/model_fields/tests.py +++ b/tests/regressiontests/model_fields/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import datetime from decimal import Decimal @@ -8,14 +10,15 @@ from django.db import models from django.db.models.fields.files import FieldFile from django.utils import unittest -from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel, Document, RenamedField +from .models import (Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, + NullBooleanModel, BooleanModel, Document, RenamedField) # If PIL available, do these tests. if Image: - from imagefield import ( - ImageFieldTests, ImageFieldTwoDimensionsTests, TwoImageFieldTests, - ImageFieldNoDimensionsTests, ImageFieldOneDimensionTests, - ImageFieldDimensionsFirstTests, ImageFieldUsingFileTests) + from .imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests, + TwoImageFieldTests, ImageFieldNoDimensionsTests, + ImageFieldOneDimensionTests, ImageFieldDimensionsFirstTests, + ImageFieldUsingFileTests) class BasicFieldTests(test.TestCase): diff --git a/tests/regressiontests/model_forms_regress/models.py b/tests/regressiontests/model_forms_regress/models.py index 3bec6358ca..cdf324164d 100644 --- a/tests/regressiontests/model_forms_regress/models.py +++ b/tests/regressiontests/model_forms_regress/models.py @@ -1,6 +1,7 @@ import os -from django.db import models + from django.core.exceptions import ValidationError +from django.db import models class Person(models.Model): diff --git a/tests/regressiontests/model_forms_regress/tests.py b/tests/regressiontests/model_forms_regress/tests.py index 05b8abd4d3..d22bcb7331 100644 --- a/tests/regressiontests/model_forms_regress/tests.py +++ b/tests/regressiontests/model_forms_regress/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from datetime import date from django import forms @@ -8,7 +10,7 @@ from django.forms.models import (modelform_factory, ModelChoiceField, from django.utils import unittest from django.test import TestCase -from models import (Person, RealPerson, Triple, FilePathModel, Article, +from .models import (Person, RealPerson, Triple, FilePathModel, Article, Publication, CustomFF, Author, Author1, Homepage, Document, Edition) diff --git a/tests/regressiontests/model_formsets_regress/models.py b/tests/regressiontests/model_formsets_regress/models.py index 937c789504..189ed8072e 100644 --- a/tests/regressiontests/model_formsets_regress/models.py +++ b/tests/regressiontests/model_formsets_regress/models.py @@ -1,5 +1,6 @@ from django.db import models + class User(models.Model): username = models.CharField(max_length=12, unique=True) serial = models.IntegerField() diff --git a/tests/regressiontests/model_formsets_regress/tests.py b/tests/regressiontests/model_formsets_regress/tests.py index e6c2633a08..35a794aa78 100644 --- a/tests/regressiontests/model_formsets_regress/tests.py +++ b/tests/regressiontests/model_formsets_regress/tests.py @@ -1,10 +1,12 @@ +from __future__ import absolute_import + from django import forms from django.forms.formsets import BaseFormSet, DELETION_FIELD_NAME from django.forms.util import ErrorDict, ErrorList from django.forms.models import modelform_factory, inlineformset_factory, modelformset_factory, BaseModelFormSet from django.test import TestCase -from models import User, UserSite, Restaurant, Manager, Network, Host +from .models import User, UserSite, Restaurant, Manager, Network, Host class InlineFormsetTests(TestCase): diff --git a/tests/regressiontests/model_inheritance_regress/tests.py b/tests/regressiontests/model_inheritance_regress/tests.py index 3a7436000c..99f7f1d377 100644 --- a/tests/regressiontests/model_inheritance_regress/tests.py +++ b/tests/regressiontests/model_inheritance_regress/tests.py @@ -2,12 +2,14 @@ Regression tests for Model inheritance behaviour. """ +from __future__ import absolute_import + import datetime from operator import attrgetter from django.test import TestCase -from models import (Place, Restaurant, ItalianRestaurant, ParkingLot, +from .models import (Place, Restaurant, ItalianRestaurant, ParkingLot, ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent, SelfRefChild, ArticleWithAuthor, M2MChild, QualityControl, DerivedM, Person, BirthdayParty, BachelorParty, MessyBachelorParty, diff --git a/tests/regressiontests/model_inheritance_select_related/models.py b/tests/regressiontests/model_inheritance_select_related/models.py index 5851e467ce..d5f4152d0a 100644 --- a/tests/regressiontests/model_inheritance_select_related/models.py +++ b/tests/regressiontests/model_inheritance_select_related/models.py @@ -5,6 +5,7 @@ select_related(). from django.db import models + class Place(models.Model): name = models.CharField(max_length=50) diff --git a/tests/regressiontests/model_inheritance_select_related/tests.py b/tests/regressiontests/model_inheritance_select_related/tests.py index e1ed609396..078b466d0e 100644 --- a/tests/regressiontests/model_inheritance_select_related/tests.py +++ b/tests/regressiontests/model_inheritance_select_related/tests.py @@ -1,8 +1,10 @@ +from __future__ import absolute_import + from operator import attrgetter from django.test import TestCase -from models import Restaurant, Person +from .models import Restaurant, Person class ModelInheritanceSelectRelatedTests(TestCase): diff --git a/tests/regressiontests/model_permalink/models.py b/tests/regressiontests/model_permalink/models.py index b2b3f704e9..4823fd46c7 100644 --- a/tests/regressiontests/model_permalink/models.py +++ b/tests/regressiontests/model_permalink/models.py @@ -1,5 +1,6 @@ from django.db import models + class Guitarist(models.Model): name = models.CharField(max_length=50) slug = models.CharField(max_length=50) diff --git a/tests/regressiontests/model_permalink/tests.py b/tests/regressiontests/model_permalink/tests.py index 40b6cd0292..8286f6811a 100644 --- a/tests/regressiontests/model_permalink/tests.py +++ b/tests/regressiontests/model_permalink/tests.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.model_permalink.models import Guitarist + +from .models import Guitarist + class PermalinkTests(TestCase): urls = 'regressiontests.model_permalink.urls' diff --git a/tests/regressiontests/model_regress/tests.py b/tests/regressiontests/model_regress/tests.py index db539f27d2..07ad8faea1 100644 --- a/tests/regressiontests/model_regress/tests.py +++ b/tests/regressiontests/model_regress/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import datetime from operator import attrgetter @@ -5,7 +7,7 @@ from django.core.exceptions import ValidationError from django.test import TestCase, skipUnlessDBFeature from django.utils import tzinfo -from models import (Worker, Article, Party, Event, Department, +from .models import (Worker, Article, Party, Event, Department, BrokenUnicodeMethod, NonAutoPK) diff --git a/tests/regressiontests/modeladmin/models.py b/tests/regressiontests/modeladmin/models.py index ae180a4936..33202fad8f 100644 --- a/tests/regressiontests/modeladmin/models.py +++ b/tests/regressiontests/modeladmin/models.py @@ -1,6 +1,7 @@ # coding: utf-8 -from django.db import models from django.contrib.auth.models import User +from django.db import models + class Band(models.Model): name = models.CharField(max_length=100) diff --git a/tests/regressiontests/modeladmin/tests.py b/tests/regressiontests/modeladmin/tests.py index 1e8c12e5bc..9b60945041 100644 --- a/tests/regressiontests/modeladmin/tests.py +++ b/tests/regressiontests/modeladmin/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from datetime import date from django import forms @@ -15,8 +17,7 @@ from django.forms.widgets import Select from django.test import TestCase from django.utils import unittest -from models import (Band, Concert, ValidationTestModel, - ValidationTestInlineModel) +from .models import Band, Concert, ValidationTestModel, ValidationTestInlineModel class MockRequest(object): diff --git a/tests/regressiontests/multiple_database/models.py b/tests/regressiontests/multiple_database/models.py index 8146c57ccb..7d655fe3d6 100644 --- a/tests/regressiontests/multiple_database/models.py +++ b/tests/regressiontests/multiple_database/models.py @@ -1,8 +1,11 @@ +from __future__ import absolute_import + from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic from django.db import models + class Review(models.Model): source = models.CharField(max_length=100) content_type = models.ForeignKey(ContentType) diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/regressiontests/multiple_database/tests.py index 2d5b0a82aa..741cba4ef1 100644 --- a/tests/regressiontests/multiple_database/tests.py +++ b/tests/regressiontests/multiple_database/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import datetime import pickle from StringIO import StringIO @@ -9,7 +11,7 @@ from django.db import connections, router, DEFAULT_DB_ALIAS from django.db.models import signals from django.test import TestCase -from models import Book, Person, Pet, Review, UserProfile +from .models import Book, Person, Pet, Review, UserProfile class QueryTestCase(TestCase): diff --git a/tests/regressiontests/null_fk/models.py b/tests/regressiontests/null_fk/models.py index d96118c5c1..e32ff542a0 100644 --- a/tests/regressiontests/null_fk/models.py +++ b/tests/regressiontests/null_fk/models.py @@ -4,6 +4,7 @@ Regression tests for proper working of ForeignKey(null=True). from django.db import models + class SystemDetails(models.Model): details = models.TextField() diff --git a/tests/regressiontests/null_fk/tests.py b/tests/regressiontests/null_fk/tests.py index 2825cc9c8b..abcfde9391 100644 --- a/tests/regressiontests/null_fk/tests.py +++ b/tests/regressiontests/null_fk/tests.py @@ -1,7 +1,11 @@ -from django.test import TestCase +from __future__ import absolute_import + from django.db.models import Q +from django.test import TestCase + +from .models import (SystemDetails, Item, PropertyValue, SystemInfo, Forum, + Post, Comment) -from regressiontests.null_fk.models import * class NullFkTests(TestCase): diff --git a/tests/regressiontests/null_fk_ordering/models.py b/tests/regressiontests/null_fk_ordering/models.py index d0635e8acc..ac714f9ad5 100644 --- a/tests/regressiontests/null_fk_ordering/models.py +++ b/tests/regressiontests/null_fk_ordering/models.py @@ -8,6 +8,7 @@ xpected results from django.db import models + # The first two models represent a very simple null FK ordering case. class Author(models.Model): name = models.CharField(max_length=150) diff --git a/tests/regressiontests/null_fk_ordering/tests.py b/tests/regressiontests/null_fk_ordering/tests.py index c9ee4f7b1a..aea969de4f 100644 --- a/tests/regressiontests/null_fk_ordering/tests.py +++ b/tests/regressiontests/null_fk_ordering/tests.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.null_fk_ordering.models import * +from .models import Author, Article, SystemInfo, Forum, Post, Comment + class NullFkOrderingTests(TestCase): diff --git a/tests/regressiontests/null_queries/models.py b/tests/regressiontests/null_queries/models.py index 442535c11c..ff9916fa2f 100644 --- a/tests/regressiontests/null_queries/models.py +++ b/tests/regressiontests/null_queries/models.py @@ -1,5 +1,6 @@ from django.db import models + class Poll(models.Model): question = models.CharField(max_length=200) diff --git a/tests/regressiontests/null_queries/tests.py b/tests/regressiontests/null_queries/tests.py index ab66ff65f9..47c99fbcb3 100644 --- a/tests/regressiontests/null_queries/tests.py +++ b/tests/regressiontests/null_queries/tests.py @@ -1,7 +1,9 @@ +from __future__ import absolute_import + from django.test import TestCase from django.core.exceptions import FieldError -from regressiontests.null_queries.models import * +from .models import Poll, Choice, OuterA, Inner, OuterB class NullQueriesTests(TestCase): diff --git a/tests/regressiontests/one_to_one_regress/models.py b/tests/regressiontests/one_to_one_regress/models.py index a7edbc098e..0e4eef65ca 100644 --- a/tests/regressiontests/one_to_one_regress/models.py +++ b/tests/regressiontests/one_to_one_regress/models.py @@ -1,5 +1,6 @@ from django.db import models + class Place(models.Model): name = models.CharField(max_length=50) address = models.CharField(max_length=80) diff --git a/tests/regressiontests/one_to_one_regress/tests.py b/tests/regressiontests/one_to_one_regress/tests.py index 5dae2cac8b..88980c2191 100644 --- a/tests/regressiontests/one_to_one_regress/tests.py +++ b/tests/regressiontests/one_to_one_regress/tests.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.one_to_one_regress.models import * + +from .models import Place, Restaurant, Bar, Favorites, Target, UndergroundBar + class OneToOneRegressionTests(TestCase): diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py index 8f6a4fb51c..e69ce48ab1 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -6,6 +6,7 @@ import threading from django.db import models + class DumbCategory(models.Model): pass @@ -342,4 +343,4 @@ class OneToOneCategory(models.Model): def __unicode__(self): return "one2one " + self.new_name - + diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py index d8fd5bc9ce..bc8dcfdbb7 100644 --- a/tests/regressiontests/queries/tests.py +++ b/tests/regressiontests/queries/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import datetime import pickle import sys @@ -11,11 +13,12 @@ from django.test import TestCase, skipUnlessDBFeature from django.utils import unittest from django.utils.datastructures import SortedDict -from models import (Annotation, Article, Author, Celebrity, Child, Cover, Detail, - DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ, ManagedModel, - Member, NamedCategory, Note, Number, Plaything, PointerA, Ranking, Related, - Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, Node, ObjectA, ObjectB, - ObjectC, CategoryItem, SimpleCategory, SpecialCategory, OneToOneCategory) +from .models import (Annotation, Article, Author, Celebrity, Child, Cover, + Detail, DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ, + ManagedModel, Member, NamedCategory, Note, Number, Plaything, PointerA, + Ranking, Related, Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, + Node, ObjectA, ObjectB, ObjectC, CategoryItem, SimpleCategory, + SpecialCategory, OneToOneCategory) class BaseQuerysetTest(TestCase): diff --git a/tests/regressiontests/queryset_pickle/models.py b/tests/regressiontests/queryset_pickle/models.py index df0a6e648d..d3500c903b 100644 --- a/tests/regressiontests/queryset_pickle/models.py +++ b/tests/regressiontests/queryset_pickle/models.py @@ -1,7 +1,11 @@ +from __future__ import absolute_import + import datetime + from django.db import models from django.utils.translation import ugettext_lazy as _ + def standalone_number(self): return 1 diff --git a/tests/regressiontests/queryset_pickle/tests.py b/tests/regressiontests/queryset_pickle/tests.py index 5c64687468..f73e61a900 100644 --- a/tests/regressiontests/queryset_pickle/tests.py +++ b/tests/regressiontests/queryset_pickle/tests.py @@ -1,9 +1,11 @@ +from __future__ import absolute_import + import pickle import datetime from django.test import TestCase -from models import Group, Event, Happening +from .models import Group, Event, Happening class PickleabilityTestCase(TestCase): diff --git a/tests/regressiontests/reverse_single_related/models.py b/tests/regressiontests/reverse_single_related/models.py index a2d8fb0fac..898be8411b 100644 --- a/tests/regressiontests/reverse_single_related/models.py +++ b/tests/regressiontests/reverse_single_related/models.py @@ -1,5 +1,6 @@ from django.db import models + class SourceManager(models.Manager): def get_query_set(self): return super(SourceManager, self).get_query_set().filter(is_public=True) diff --git a/tests/regressiontests/reverse_single_related/tests.py b/tests/regressiontests/reverse_single_related/tests.py index a93eed5fd8..0c755c4db6 100644 --- a/tests/regressiontests/reverse_single_related/tests.py +++ b/tests/regressiontests/reverse_single_related/tests.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.reverse_single_related.models import * +from .models import Source, Item + class ReverseSingleRelatedTests(TestCase): """ diff --git a/tests/regressiontests/select_related_onetoone/tests.py b/tests/regressiontests/select_related_onetoone/tests.py index 3e7023acdf..f995a115f2 100644 --- a/tests/regressiontests/select_related_onetoone/tests.py +++ b/tests/regressiontests/select_related_onetoone/tests.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.test import TestCase -from models import (User, UserProfile, UserStat, UserStatResult, StatDetails, +from .models import (User, UserProfile, UserStat, UserStatResult, StatDetails, AdvancedUserStat, Image, Product) class ReverseSelectRelatedTestCase(TestCase): diff --git a/tests/regressiontests/select_related_regress/models.py b/tests/regressiontests/select_related_regress/models.py index 3efb19e0ac..43e64f0e69 100644 --- a/tests/regressiontests/select_related_regress/models.py +++ b/tests/regressiontests/select_related_regress/models.py @@ -1,5 +1,6 @@ from django.db import models + class Building(models.Model): name = models.CharField(max_length=10) diff --git a/tests/regressiontests/select_related_regress/tests.py b/tests/regressiontests/select_related_regress/tests.py index ede1385351..4818b95cdd 100644 --- a/tests/regressiontests/select_related_regress/tests.py +++ b/tests/regressiontests/select_related_regress/tests.py @@ -1,5 +1,11 @@ +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.select_related_regress.models import * + +from .models import (Building, Child, Device, Port, Item, Country, Connection, + ClientStatus, State, Client, SpecialClient, TUser, Person, Student, + Organizer, Class, Enrollment) + class SelectRelatedRegressTests(TestCase): diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py index bb6f598719..4af83f8f66 100644 --- a/tests/regressiontests/serializers_regress/tests.py +++ b/tests/regressiontests/serializers_regress/tests.py @@ -8,7 +8,7 @@ forward, backwards and self references. """ # This is necessary in Python 2.5 to enable the with statement, in 2.6 # and up it is no longer necessary. -from __future__ import with_statement +from __future__ import with_statement, absolute_import import datetime import decimal @@ -19,11 +19,23 @@ except ImportError: from django.core import serializers from django.core.serializers import SerializerDoesNotExist -from django.db import connection +from django.db import connection, models from django.test import TestCase from django.utils.functional import curry -from models import * +from .models import (BooleanData, CharData, DateData, DateTimeData, EmailData, + FileData, FilePathData, DecimalData, FloatData, IntegerData, IPAddressData, + GenericIPAddressData, NullBooleanData, PhoneData, PositiveIntegerData, + PositiveSmallIntegerData, SlugData, SmallData, TextData, TimeData, + USStateData, GenericData, Anchor, UniqueAnchor, FKData, M2MData, O2OData, + FKSelfData, M2MSelfData, FKDataToField, FKDataToO2O, M2MIntermediateData, + Intermediate, BooleanPKData, CharPKData, EmailPKData, FilePathPKData, + DecimalPKData, FloatPKData, IntegerPKData, IPAddressPKData, + GenericIPAddressPKData, PhonePKData, PositiveIntegerPKData, + PositiveSmallIntegerPKData, SlugPKData, SmallPKData, USStatePKData, + AutoNowDateTimeData, ModifyingSaveData, InheritAbstractModel, + ExplicitInheritBaseModel, InheritBaseModel, BigIntegerData, LengthModel, + Tag, ComplexModel) # A set of functions that can be used to recreate # test data objects of various kinds. diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py index d95f27652c..7aa0e2a796 100644 --- a/tests/regressiontests/settings_tests/tests.py +++ b/tests/regressiontests/settings_tests/tests.py @@ -1,5 +1,7 @@ from __future__ import with_statement + import os + from django.conf import settings, global_settings from django.test import TransactionTestCase, TestCase, signals from django.test.utils import override_settings diff --git a/tests/regressiontests/signals_regress/models.py b/tests/regressiontests/signals_regress/models.py index e7879d8ccc..bf64f69e8c 100644 --- a/tests/regressiontests/signals_regress/models.py +++ b/tests/regressiontests/signals_regress/models.py @@ -1,5 +1,6 @@ from django.db import models + class Author(models.Model): name = models.CharField(max_length=20) diff --git a/tests/regressiontests/signals_regress/tests.py b/tests/regressiontests/signals_regress/tests.py index 332f5d9f5b..4809a1e2a5 100644 --- a/tests/regressiontests/signals_regress/tests.py +++ b/tests/regressiontests/signals_regress/tests.py @@ -1,7 +1,10 @@ -from django.test import TestCase +from __future__ import absolute_import from django.db import models -from regressiontests.signals_regress.models import Author, Book +from django.test import TestCase + +from .models import Author, Book + signal_output = [] diff --git a/tests/regressiontests/signed_cookies_tests/tests.py b/tests/regressiontests/signed_cookies_tests/tests.py index c28892af61..5a0b5f9aa4 100644 --- a/tests/regressiontests/signed_cookies_tests/tests.py +++ b/tests/regressiontests/signed_cookies_tests/tests.py @@ -4,6 +4,7 @@ from django.core import signing from django.http import HttpRequest, HttpResponse from django.test import TestCase + class SignedCookieTest(TestCase): def test_can_set_and_read_signed_cookies(self): diff --git a/tests/regressiontests/signing/tests.py b/tests/regressiontests/signing/tests.py index a9065131da..54bc302454 100644 --- a/tests/regressiontests/signing/tests.py +++ b/tests/regressiontests/signing/tests.py @@ -4,6 +4,7 @@ from django.core import signing from django.test import TestCase from django.utils.encoding import force_unicode + class TestSigner(TestCase): def test_signature(self): diff --git a/tests/regressiontests/sites_framework/tests.py b/tests/regressiontests/sites_framework/tests.py index b737727a56..8e664fd501 100644 --- a/tests/regressiontests/sites_framework/tests.py +++ b/tests/regressiontests/sites_framework/tests.py @@ -1,18 +1,22 @@ +from __future__ import absolute_import + from django.conf import settings from django.contrib.sites.models import Site from django.test import TestCase -from models import SyndicatedArticle, ExclusiveArticle, CustomArticle, InvalidArticle, ConfusedArticle +from .models import (SyndicatedArticle, ExclusiveArticle, CustomArticle, + InvalidArticle, ConfusedArticle) + class SitesFrameworkTestCase(TestCase): def setUp(self): Site.objects.get_or_create(id=settings.SITE_ID, domain="example.com", name="example.com") Site.objects.create(id=settings.SITE_ID+1, domain="example2.com", name="example2.com") - + def test_site_fk(self): article = ExclusiveArticle.objects.create(title="Breaking News!", site_id=settings.SITE_ID) self.assertEqual(ExclusiveArticle.on_site.all().get(), article) - + def test_sites_m2m(self): article = SyndicatedArticle.objects.create(title="Fresh News!") article.sites.add(Site.objects.get(id=settings.SITE_ID)) @@ -20,15 +24,15 @@ class SitesFrameworkTestCase(TestCase): article2 = SyndicatedArticle.objects.create(title="More News!") article2.sites.add(Site.objects.get(id=settings.SITE_ID+1)) self.assertEqual(SyndicatedArticle.on_site.all().get(), article) - + def test_custom_named_field(self): article = CustomArticle.objects.create(title="Tantalizing News!", places_this_article_should_appear_id=settings.SITE_ID) self.assertEqual(CustomArticle.on_site.all().get(), article) - + def test_invalid_name(self): article = InvalidArticle.objects.create(title="Bad News!", site_id=settings.SITE_ID) self.assertRaises(ValueError, InvalidArticle.on_site.all) - + def test_invalid_field_type(self): article = ConfusedArticle.objects.create(title="More Bad News!", site=settings.SITE_ID) self.assertRaises(TypeError, ConfusedArticle.on_site.all) diff --git a/tests/regressiontests/special_headers/models.py b/tests/regressiontests/special_headers/models.py index 0c126757cc..e05c5a6920 100644 --- a/tests/regressiontests/special_headers/models.py +++ b/tests/regressiontests/special_headers/models.py @@ -1,4 +1,5 @@ from django.db import models + class Article(models.Model): text = models.TextField() diff --git a/tests/regressiontests/special_headers/tests.py b/tests/regressiontests/special_headers/tests.py index 45e6a82b2b..4de518c89e 100644 --- a/tests/regressiontests/special_headers/tests.py +++ b/tests/regressiontests/special_headers/tests.py @@ -1,7 +1,7 @@ import warnings -from django.test import TestCase from django.contrib.auth.models import User +from django.test import TestCase class SpecialHeadersTest(TestCase): diff --git a/tests/regressiontests/special_headers/urls.py b/tests/regressiontests/special_headers/urls.py index db19ab958d..2e6a305bf0 100644 --- a/tests/regressiontests/special_headers/urls.py +++ b/tests/regressiontests/special_headers/urls.py @@ -1,8 +1,11 @@ # coding: utf-8 +from __future__ import absolute_import + from django.conf.urls import patterns from django.views.generic.list_detail import object_detail -from models import Article -import views + +from . import views +from .models import Article urlpatterns = patterns('', (r'^special_headers/article/(?P<object_id>\d+)/$', object_detail, {'queryset': Article.objects.all()}), diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py index 5c141f695a..f12914f642 100644 --- a/tests/regressiontests/staticfiles_tests/tests.py +++ b/tests/regressiontests/staticfiles_tests/tests.py @@ -1,5 +1,6 @@ # -*- encoding: utf-8 -*- from __future__ import with_statement + import codecs import os import posixpath diff --git a/tests/regressiontests/string_lookup/models.py b/tests/regressiontests/string_lookup/models.py index 037854dadd..53687a22cb 100644 --- a/tests/regressiontests/string_lookup/models.py +++ b/tests/regressiontests/string_lookup/models.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from django.db import models + class Foo(models.Model): name = models.CharField(max_length=50) friend = models.CharField(max_length=50, blank=True) diff --git a/tests/regressiontests/string_lookup/tests.py b/tests/regressiontests/string_lookup/tests.py index 152e1ffbec..f5ae73a6ca 100644 --- a/tests/regressiontests/string_lookup/tests.py +++ b/tests/regressiontests/string_lookup/tests.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + from django.test import TestCase -from regressiontests.string_lookup.models import Foo, Whiz, Bar, Article, Base, Child +from .models import Foo, Whiz, Bar, Article, Base, Child + class StringLookupTests(TestCase): diff --git a/tests/regressiontests/syndication/feeds.py b/tests/regressiontests/syndication/feeds.py index c310892f01..41feb89550 100644 --- a/tests/regressiontests/syndication/feeds.py +++ b/tests/regressiontests/syndication/feeds.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import + from django.contrib.syndication import views from django.core.exceptions import ObjectDoesNotExist from django.utils import feedgenerator, tzinfo -from models import Article, Entry + +from .models import Article, Entry class ComplexFeed(views.Feed): diff --git a/tests/regressiontests/syndication/models.py b/tests/regressiontests/syndication/models.py index 54230b9623..a2c504e57f 100644 --- a/tests/regressiontests/syndication/models.py +++ b/tests/regressiontests/syndication/models.py @@ -1,5 +1,6 @@ from django.db import models + class Entry(models.Model): title = models.CharField(max_length=200) date = models.DateTimeField() diff --git a/tests/regressiontests/syndication/tests.py b/tests/regressiontests/syndication/tests.py index 66432981dd..14dcd0a471 100644 --- a/tests/regressiontests/syndication/tests.py +++ b/tests/regressiontests/syndication/tests.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from xml.dom import minidom from django.contrib.syndication import views @@ -6,7 +8,7 @@ from django.test import TestCase from django.utils import tzinfo from django.utils.feedgenerator import rfc2822_date, rfc3339_date -from models import Entry +from .models import Entry class FeedTestCase(TestCase): diff --git a/tests/regressiontests/syndication/urls.py b/tests/regressiontests/syndication/urls.py index ddbc7a130a..2199e29f06 100644 --- a/tests/regressiontests/syndication/urls.py +++ b/tests/regressiontests/syndication/urls.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns -import feeds +from . import feeds + urlpatterns = patterns('django.contrib.syndication.views', (r'^syndication/complex/(?P<foo>.*)/$', feeds.ComplexFeed()), diff --git a/tests/regressiontests/templates/alternate_urls.py b/tests/regressiontests/templates/alternate_urls.py index ca74d64635..fa4985a9dc 100644 --- a/tests/regressiontests/templates/alternate_urls.py +++ b/tests/regressiontests/templates/alternate_urls.py @@ -1,7 +1,10 @@ # coding: utf-8 + +from __future__ import absolute_import + from django.conf.urls import patterns, url -from regressiontests.templates import views +from . import views urlpatterns = patterns('', diff --git a/tests/regressiontests/templates/custom.py b/tests/regressiontests/templates/custom.py index c05229e6f2..6bbbe35f03 100644 --- a/tests/regressiontests/templates/custom.py +++ b/tests/regressiontests/templates/custom.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import + from django import template from django.utils.unittest import TestCase -from templatetags import custom + +from .templatetags import custom + class CustomFilterTests(TestCase): def test_filter(self): diff --git a/tests/regressiontests/templates/response.py b/tests/regressiontests/templates/response.py index f7bcb60f1b..5feb8cc51b 100644 --- a/tests/regressiontests/templates/response.py +++ b/tests/regressiontests/templates/response.py @@ -1,8 +1,10 @@ from __future__ import with_statement -from datetime import datetime + import os import pickle import time +from datetime import datetime + from django.utils import unittest from django.test import RequestFactory, TestCase from django.conf import settings diff --git a/tests/regressiontests/templates/templatetags/bad_tag.py b/tests/regressiontests/templates/templatetags/bad_tag.py index 2274395a11..3cceb31eb0 100644 --- a/tests/regressiontests/templates/templatetags/bad_tag.py +++ b/tests/regressiontests/templates/templatetags/bad_tag.py @@ -1,5 +1,6 @@ from django import template + register = template.Library() @register.tag diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index f85416563b..d0c2204f37 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import with_statement +from __future__ import with_statement, absolute_import from django.conf import settings @@ -17,10 +17,11 @@ import warnings from urlparse import urljoin from django import template -from django.template import base as template_base, RequestContext +from django.template import base as template_base, RequestContext, Template, Context from django.core import urlresolvers from django.template import loader from django.template.loaders import app_directories, filesystem, cached +from django.test import RequestFactory from django.test.utils import (get_warnings_state, restore_warnings_state, setup_test_template_loader, restore_template_loaders, override_settings) from django.utils import unittest @@ -29,24 +30,25 @@ from django.utils.translation import activate, deactivate, ugettext as _ from django.utils.safestring import mark_safe from django.utils.tzinfo import LocalTimezone -from callables import * -from context import ContextTests -from custom import CustomTagTests, CustomFilterTests -from parser import ParserTests -from unicode import UnicodeTests -from nodelist import NodelistTest, ErrorIndexTest -from smartif import * -from response import * +from .callables import CallableVariablesTests +from .context import ContextTests +from .custom import CustomTagTests, CustomFilterTests +from .parser import ParserTests +from .unicode import UnicodeTests +from .nodelist import NodelistTest, ErrorIndexTest +from .smartif import SmartIfTests +from .response import (TemplateResponseTest, BaseTemplateResponseTest, + CacheMiddlewareTest, SimpleTemplateResponseTest, CustomURLConfTest) try: - from loaders import * + from .loaders import RenderToStringTest, EggLoaderTest except ImportError, e: if "pkg_resources" in e.message: pass # If setuptools isn't installed, that's fine. Just move on. else: raise -import filters +from . import filters ################################# # Custom template tag for tests # diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index 96e1ea2bfe..b977698350 100644 --- a/tests/regressiontests/templates/urls.py +++ b/tests/regressiontests/templates/urls.py @@ -1,6 +1,9 @@ # coding: utf-8 +from __future__ import absolute_import + from django.conf.urls import patterns, url -from regressiontests.templates import views +from . import views + urlpatterns = patterns('', diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py index b973575509..5590c2337d 100644 --- a/tests/regressiontests/test_client_regress/urls.py +++ b/tests/regressiontests/test_client_regress/urls.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url from django.views.generic import RedirectView -import views + +from . import views + urlpatterns = patterns('', (r'^no_template_view/$', views.no_template_view), diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index d2f064e7a0..4e2555ee2e 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -1,6 +1,8 @@ """ Tests for django test runner """ +from __future__ import absolute_import + import StringIO from optparse import make_option import warnings @@ -13,7 +15,7 @@ from django.test.utils import get_warnings_state, restore_warnings_state from django.utils import unittest from django.utils.importlib import import_module -from regressiontests.admin_scripts.tests import AdminScriptTestCase +from ..admin_scripts.tests import AdminScriptTestCase TEST_APP_OK = 'regressiontests.test_runner.valid_app.models' diff --git a/tests/regressiontests/test_utils/tests.py b/tests/regressiontests/test_utils/tests.py index 942aa85148..c192d51d55 100644 --- a/tests/regressiontests/test_utils/tests.py +++ b/tests/regressiontests/test_utils/tests.py @@ -1,10 +1,10 @@ -from __future__ import with_statement +from __future__ import with_statement, absolute_import from django.forms import EmailField from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature from django.utils.unittest import skip -from models import Person +from .models import Person class SkippingTestCase(TestCase): diff --git a/tests/regressiontests/test_utils/urls.py b/tests/regressiontests/test_utils/urls.py index 1bf0a0c756..31fc5cc7fc 100644 --- a/tests/regressiontests/test_utils/urls.py +++ b/tests/regressiontests/test_utils/urls.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.conf.urls import patterns -import views +from . import views urlpatterns = patterns('', diff --git a/tests/regressiontests/test_utils/views.py b/tests/regressiontests/test_utils/views.py index 62af0d9c47..5495488e2c 100644 --- a/tests/regressiontests/test_utils/views.py +++ b/tests/regressiontests/test_utils/views.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import + from django.http import HttpResponse from django.shortcuts import get_object_or_404 -from models import Person + +from .models import Person + def get_person(request, pk): person = get_object_or_404(Person, pk=pk) diff --git a/tests/regressiontests/transactions_regress/tests.py b/tests/regressiontests/transactions_regress/tests.py index da40d8e35a..26ef4163e6 100644 --- a/tests/regressiontests/transactions_regress/tests.py +++ b/tests/regressiontests/transactions_regress/tests.py @@ -1,9 +1,11 @@ +from __future__ import absolute_import + from django.core.exceptions import ImproperlyConfigured from django.db import connection, transaction from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError from django.test import TransactionTestCase, skipUnlessDBFeature -from models import Mod +from .models import Mod class TestTransactionClosing(TransactionTestCase): diff --git a/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/tests/regressiontests/urlpatterns_reverse/extra_urls.py index 4dbfb90c22..c737f8b5c4 100644 --- a/tests/regressiontests/urlpatterns_reverse/extra_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/extra_urls.py @@ -2,8 +2,12 @@ Some extra URL patterns that are included at the top level. """ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^e-places/(\d+)/$', empty_view, name='extra-places'), diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py index 32d2b2976b..af03097df1 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^$', empty_view, name="named-url3"), diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py index 2a9779d64f..b31bdb1f7e 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py +++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^$', empty_view, name="named-url5"), diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py index c878f97716..2743f67eea 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py @@ -1,6 +1,10 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from namespace_urls import URLObject -from views import view_class_instance + +from .namespace_urls import URLObject +from .views import view_class_instance + testobj3 = URLObject('testapp', 'test-ns3') diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py index ae2c626336..c8c9001843 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/included_urls.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^$', empty_view, name="inner-nothing"), diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_urls2.py index b6fb4c6a6a..98605047f4 100644 --- a/tests/regressiontests/urlpatterns_reverse/included_urls2.py +++ b/tests/regressiontests/urlpatterns_reverse/included_urls2.py @@ -5,8 +5,12 @@ each name to resolve and Django must distinguish the possibilities based on the argument list. """ +from __future__ import absolute_import + from django.conf.urls import patterns, url -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^part/(?P<value>\w+)/$', empty_view, name="part"), diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/regressiontests/urlpatterns_reverse/middleware.py index 7bc42f8df4..03749e9570 100644 --- a/tests/regressiontests/urlpatterns_reverse/middleware.py +++ b/tests/regressiontests/urlpatterns_reverse/middleware.py @@ -1,4 +1,7 @@ -import urlconf_inner +from __future__ import absolute_import + +from . import urlconf_inner + class ChangeURLconfMiddleware(object): def process_request(self, request): diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py index fa71f53c17..8df336cf4b 100644 --- a/tests/regressiontests/urlpatterns_reverse/named_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/named_urls.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('', url(r'^$', empty_view, name="named-url1"), diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py index 5a516f92cc..5f9db2519d 100644 --- a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from views import view_class_instance + +from .views import view_class_instance + class URLObject(object): def __init__(self, app_name, namespace): diff --git a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py index 5d336268d9..693c6e1b38 100644 --- a/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py +++ b/tests/regressiontests/urlpatterns_reverse/reverse_lazy_urls.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url -from views import empty_view, LazyRedirectView, login_required_view +from .views import empty_view, LazyRedirectView, login_required_view urlpatterns = patterns('', url(r'^redirected_to/$', empty_view, name='named-lazy-url-redirected-to'), diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py index 4b656e4909..fd2666f9d5 100644 --- a/tests/regressiontests/urlpatterns_reverse/tests.py +++ b/tests/regressiontests/urlpatterns_reverse/tests.py @@ -1,6 +1,8 @@ """ Unit tests for reverse URL lookups. """ +from __future__ import absolute_import + from django.conf import settings from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist from django.core.urlresolvers import (reverse, resolve, NoReverseMatch, @@ -11,10 +13,8 @@ from django.test import TestCase from django.utils import unittest from django.contrib.auth.models import User -import urlconf_outer -import urlconf_inner -import middleware -import views +from . import urlconf_outer, urlconf_inner, middleware, views + resolve_test_data = ( # These entries are in the format: (path, url_name, app_name, namespace, view_func, args, kwargs) @@ -263,7 +263,7 @@ class ReverseShortcutTests(TestCase): self.assertEqual(res['Location'], 'http://example.com/') def test_redirect_view_object(self): - from views import absolute_kwargs_view + from .views import absolute_kwargs_view res = redirect(absolute_kwargs_view) self.assertEqual(res['Location'], '/absolute_arg_view/') self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None) @@ -409,13 +409,13 @@ class ErrorHandlerResolutionTests(TestCase): self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables) def test_named_handlers(self): - from views import empty_view + from .views import empty_view handler = (empty_view, {}) self.assertEqual(self.resolver.resolve404(), handler) self.assertEqual(self.resolver.resolve500(), handler) def test_callable_handers(self): - from views import empty_view + from .views import empty_view handler = (empty_view, {}) self.assertEqual(self.callable_resolver.resolve404(), handler) self.assertEqual(self.callable_resolver.resolve500(), handler) diff --git a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py index 0762fc5db0..0cdebf83ff 100644 --- a/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py +++ b/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py @@ -1,6 +1,8 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -import urlconf_inner +from . import urlconf_inner urlpatterns = patterns('', diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py index 6a324f042d..5bde2b0a7e 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls.py +++ b/tests/regressiontests/urlpatterns_reverse/urls.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + from django.conf.urls import patterns, url, include -from views import empty_view, absolute_kwargs_view + +from .views import empty_view, absolute_kwargs_view + other_patterns = patterns('', url(r'non_path_include/$', empty_view, name='non_path_include'), diff --git a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py index c3d4855086..fe2d3137e9 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py +++ b/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py @@ -1,7 +1,11 @@ # Used by the ErrorHandlerResolutionTests test case. +from __future__ import absolute_import + from django.conf.urls import patterns -from views import empty_view + +from .views import empty_view + urlpatterns = patterns('') diff --git a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py index 0e58a157cf..ca3e424f23 100644 --- a/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py +++ b/tests/regressiontests/urlpatterns_reverse/urls_without_full_import.py @@ -1,8 +1,12 @@ # A URLs file that doesn't use the default # from django.conf.urls import * # import pattern. +from __future__ import absolute_import + from django.conf.urls import patterns, url -from views import empty_view, bad_view + +from .views import empty_view, bad_view + urlpatterns = patterns('', url(r'^test_view/$', empty_view, name="test_view"), diff --git a/tests/regressiontests/utils/simplelazyobject.py b/tests/regressiontests/utils/simplelazyobject.py index c63c948f30..8a02f52fb6 100644 --- a/tests/regressiontests/utils/simplelazyobject.py +++ b/tests/regressiontests/utils/simplelazyobject.py @@ -1,6 +1,6 @@ import copy -from django.utils.unittest import TestCase +from django.utils.unittest import TestCase from django.utils.functional import SimpleLazyObject, empty diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py index e91adc94e5..4db894d6ad 100644 --- a/tests/regressiontests/utils/tests.py +++ b/tests/regressiontests/utils/tests.py @@ -2,21 +2,24 @@ Tests for django.utils. """ -from dateformat import * -from feedgenerator import * -from module_loading import * -from termcolors import * -from html import * -from http import * -from checksums import * -from text import * -from simplelazyobject import * -from decorators import * -from functional import * -from timesince import * -from datastructures import * -from tzinfo import * -from datetime_safe import * -from baseconv import * -from jslex import * -from ipv6 import * +from __future__ import absolute_import + +from .dateformat import DateFormatTests +from .feedgenerator import FeedgeneratorTest +from .module_loading import DefaultLoader, EggLoader, CustomLoader +from .termcolors import TermColorTests +from .html import TestUtilsHtml +from .http import TestUtilsHttp +from .checksums import TestUtilsChecksums +from .text import TestUtilsText +from .simplelazyobject import TestUtilsSimpleLazyObject +from .decorators import DecoratorFromMiddlewareTests +from .functional import FunctionalTestCase +from .timesince import TimesinceTests +from .datastructures import (MultiValueDictTests, SortedDictTests, + DictWrapperTests, ImmutableListTests, DotExpandedDictTests, MergeDictTests) +from .tzinfo import TzinfoTests +from .datetime_safe import DatetimeTests +from .baseconv import TestBaseConv +from .jslex import JsTokensTest, JsToCForGettextTest +from .ipv6 import TestUtilsIPv6 diff --git a/tests/regressiontests/views/generic_urls.py b/tests/regressiontests/views/generic_urls.py index cf2addc181..2d7a203cab 100644 --- a/tests/regressiontests/views/generic_urls.py +++ b/tests/regressiontests/views/generic_urls.py @@ -1,9 +1,10 @@ # -*- coding:utf-8 -*- -from django.conf.urls import patterns, url +from __future__ import absolute_import -from models import * +from django.conf.urls import patterns, url -import views +from . import views +from .models import Article, DateArticle, UrlArticle date_based_info_dict = { diff --git a/tests/regressiontests/views/templatetags/debugtags.py b/tests/regressiontests/views/templatetags/debugtags.py index 9b2c6611d8..cd2d2d9ad2 100644 --- a/tests/regressiontests/views/templatetags/debugtags.py +++ b/tests/regressiontests/views/templatetags/debugtags.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django import template - -from regressiontests.views import BrokenException + +from ..views import BrokenException + register = template.Library() diff --git a/tests/regressiontests/views/tests/__init__.py b/tests/regressiontests/views/tests/__init__.py index b888dde5dc..04537a2bcf 100644 --- a/tests/regressiontests/views/tests/__init__.py +++ b/tests/regressiontests/views/tests/__init__.py @@ -1,10 +1,15 @@ -from debug import * -from defaults import * -from generic.create_update import * -from generic.date_based import * -from generic.object_list import * -from generic.simple import * -from i18n import * -from shortcuts import * -from specials import * -from static import * +from __future__ import absolute_import + +from .debug import (DebugViewTests, ExceptionReporterTests, + ExceptionReporterTests, PlainTextReportTests, ExceptionReporterFilterTests, + AjaxResponseExceptionReporterFilter) +from .defaults import DefaultsTests +from .generic.create_update import (UpdateDeleteObjectTest, CreateObjectTest, + PostSaveRedirectTests, NoPostSaveNoAbsoluteUrl, AbsoluteUrlNoPostSave) +from .generic.date_based import MonthArchiveTest, ObjectDetailTest, DayArchiveTests +from .generic.object_list import ObjectListTest +from .generic.simple import RedirectToTest +from .i18n import JsI18NTests, I18NTests, JsI18NTestsMultiPackage +from .shortcuts import ShortcutTests +from .specials import URLHandling +from .static import StaticHelperTest, StaticTests diff --git a/tests/regressiontests/views/tests/debug.py b/tests/regressiontests/views/tests/debug.py index 093d925f0f..c6f248a8b8 100644 --- a/tests/regressiontests/views/tests/debug.py +++ b/tests/regressiontests/views/tests/debug.py @@ -1,4 +1,5 @@ -from __future__ import with_statement +from __future__ import with_statement, absolute_import + import inspect import os import sys @@ -13,9 +14,9 @@ from django.template import TemplateSyntaxError from django.views.debug import ExceptionReporter from django.core import mail -from regressiontests.views import BrokenException, except_args -from regressiontests.views.views import (sensitive_view, non_sensitive_view, - paranoid_view, custom_exception_reporter_filter_view) +from .. import BrokenException, except_args +from ..views import (sensitive_view, non_sensitive_view, paranoid_view, + custom_exception_reporter_filter_view) class DebugViewTests(TestCase): diff --git a/tests/regressiontests/views/tests/defaults.py b/tests/regressiontests/views/tests/defaults.py index 6378cf9c99..2dd40b4a1a 100644 --- a/tests/regressiontests/views/tests/defaults.py +++ b/tests/regressiontests/views/tests/defaults.py @@ -1,7 +1,10 @@ +from __future__ import absolute_import + from django.test import TestCase from django.contrib.contenttypes.models import ContentType -from regressiontests.views.models import Author, Article, UrlArticle +from ..models import Author, Article, UrlArticle + class DefaultsTests(TestCase): """Test django views in django/views/defaults.py""" diff --git a/tests/regressiontests/views/tests/i18n.py b/tests/regressiontests/views/tests/i18n.py index bd801b160d..2f67d525e1 100644 --- a/tests/regressiontests/views/tests/i18n.py +++ b/tests/regressiontests/views/tests/i18n.py @@ -1,5 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import with_statement +from __future__ import with_statement, absolute_import + import gettext from os import path @@ -8,7 +9,8 @@ from django.test import TestCase from django.utils.translation import override, activate from django.utils.text import javascript_quote -from regressiontests.views.urls import locale_dir +from ..urls import locale_dir + class I18NTests(TestCase): """ Tests django views in django/views/i18n.py """ diff --git a/tests/regressiontests/views/tests/static.py b/tests/regressiontests/views/tests/static.py index 0e76453719..3088a86eab 100644 --- a/tests/regressiontests/views/tests/static.py +++ b/tests/regressiontests/views/tests/static.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import mimetypes from os import path @@ -6,8 +8,9 @@ from django.conf.urls.static import static from django.test import TestCase from django.http import HttpResponseNotModified -from regressiontests.views import urls -from regressiontests.views.urls import media_dir +from .. import urls +from ..urls import media_dir + class StaticTests(TestCase): """Tests django views in django/views/static.py""" diff --git a/tests/regressiontests/views/urls.py b/tests/regressiontests/views/urls.py index 2ce56b67f8..90d2382f71 100644 --- a/tests/regressiontests/views/urls.py +++ b/tests/regressiontests/views/urls.py @@ -1,9 +1,11 @@ # coding: utf-8 +from __future__ import absolute_import + from os import path from django.conf.urls import patterns, url, include -import views +from . import views base_dir = path.dirname(path.abspath(__file__)) diff --git a/tests/regressiontests/views/views.py b/tests/regressiontests/views/views.py index 02f765af1c..f2b4e79322 100644 --- a/tests/regressiontests/views/views.py +++ b/tests/regressiontests/views/views.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import sys from django import forms @@ -11,9 +13,8 @@ from django.views.decorators.debug import (sensitive_post_parameters, sensitive_variables) from django.utils.log import getLogger -from regressiontests.views import BrokenException, except_args - -from models import Article +from . import BrokenException, except_args +from .models import Article def index_page(request): diff --git a/tests/runtests.py b/tests/runtests.py index d74973bc32..fce03d2325 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -5,7 +5,8 @@ import subprocess import sys import tempfile -import django.contrib as contrib +from django import contrib + CONTRIB_DIR_NAME = 'django.contrib' MODEL_TESTS_DIR_NAME = 'modeltests' |