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

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):

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):

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):

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)),

tests/regressiontests/generic_relations_regress/models.py

@@ -1,6 +1,7 @@
-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',

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):
 

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
 
 

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']

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):

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 . import views
-from regressiontests.generic_views import views
+from .models import Artist, Author
+
 
 class ModelFormMixinTests(TestCase):
     def test_get_form(self):

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):

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']

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)
 

tests/regressiontests/generic_views/tests.py

@@ -1,5 +1,10 @@
-from regressiontests.generic_views.base import ViewTest, TemplateViewTest, RedirectViewTest
+from __future__ import absolute_import
-from regressiontests.generic_views.dates import ArchiveIndexViewTests, YearArchiveViewTests, MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests, DateDetailViewTests
+
-from regressiontests.generic_views.detail import DetailViewTest
+from .base import ViewTest, TemplateViewTest, RedirectViewTest
-from regressiontests.generic_views.edit import ModelFormMixinTests, CreateViewTests, UpdateViewTests, DeleteViewTests
+from .dates import (ArchiveIndexViewTests, YearArchiveViewTests,
-from regressiontests.generic_views.list import ListViewTests
+    MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
+    DateDetailViewTests)
+from .detail import DetailViewTest
+from .edit import (ModelFormMixinTests, CreateViewTests, UpdateViewTests,
+    DeleteViewTests)
+from .list import ListViewTests

tests/regressiontests/generic_views/urls.py

@@ -1,8 +1,10 @@
-from django.conf.urls import patterns, url
+from __future__ import absolute_import
-from django.views.generic import TemplateView
-from django.views.decorators.cache import cache_page
 
-import views
+from django.conf.urls import patterns, url
+from django.views.decorators.cache import cache_page
+from django.views.generic import TemplateView
+
+from . import views
 
 
 urlpatterns = patterns('',

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 .forms import AuthorForm
-from regressiontests.generic_views.forms import AuthorForm
+from .models import Artist, Author, Book, Page
 
 
 class CustomTemplateView(generic.TemplateView):

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):

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):

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('')

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):
 

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'
 

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):

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)

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'))
 

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

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)
 
 
-from forms import I18nForm, SelectDateForm, SelectDateWidget, CompanyForm
+from .commands.tests import NoWrapExtractorTests, IgnoredExtractorTests, MessageCompilationTests, PoFileTests, BasicExtractorTests, JavascriptExtractorTests, CopyPluralFormsExtractorTests, SymlinkExtractorTests, ExtractorTests
-from models import Company, TestModel
+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__))
 

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)
 

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):

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):

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)

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

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. """

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)

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="">'

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):
 

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)

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({

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):
 

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()

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):
 

tests/regressiontests/localflavor/tests.py

@@ -1,42 +1,44 @@
-from ar.tests import *
+from __future__ import absolute_import
-from at.tests import *
+
-from au.tests import *
+from .ar.tests import ARLocalFlavorTests
-from be.tests import *
+from .at.tests import ATLocalFlavorTests
-from br.tests import *
+from .au.tests import AULocalflavorTests
-from ca.tests import *
+from .be.tests import BELocalFlavorTests
-from ch.tests import *
+from .br.tests import BRLocalFlavorTests
-from cl.tests import *
+from .ca.tests import CALocalFlavorTests
-from cn.tests import *
+from .ch.tests import CHLocalFlavorTests
-from co.tests import *
+from .cl.tests import CLLocalFlavorTests
-from cz.tests import *
+from .cn.tests import CNLocalFlavorTests
-from de.tests import *
+from .co.tests import COLocalFlavorTests
-from ec.tests import *
+from .cz.tests import CZLocalFlavorTests
-from es.tests import *
+from .de.tests import DELocalFlavorTests
-from fi.tests import *
+from .ec.tests import ECLocalFlavorTests
-from fr.tests import *
+from .es.tests import ESLocalFlavorTests
-from gb.tests import *
+from .fi.tests import FILocalFlavorTests
-from generic.tests import *
+from .fr.tests import FRLocalFlavorTests
-from hr.tests import *
+from .gb.tests import GBLocalFlavorTests
-from id.tests import *
+from .generic.tests import GenericLocalFlavorTests
-from ie.tests import *
+from .hr.tests import HRLocalFlavorTests
-from il.tests import *
+from .id.tests import IDLocalFlavorTests
-from in_.tests import *
+from .ie.tests import IELocalFlavorTests
-from is_.tests import *
+from .il.tests import ILLocalFlavorTests
-from it.tests import *
+from .in_.tests import INLocalFlavorTests
-from jp.tests import *
+from .is_.tests import ISLocalFlavorTests
-from kw.tests import *
+from .it.tests import ITLocalFlavorTests
-from mk.tests import *
+from .jp.tests import JPLocalFlavorTests
-from mx.tests import *
+from .kw.tests import KWLocalFlavorTests
-from nl.tests import *
+from .mk.tests import MKLocalFlavorTests
-from pl.tests import *
+from .mx.tests import MXLocalFlavorTests
-from pt.tests import *
+from .nl.tests import NLLocalFlavorTests
-from py.tests import *
+from .pl.tests import PLLocalFlavorTests
-from ro.tests import *
+from .pt.tests import PTLocalFlavorTests
-from ru.tests import *
+from .py.tests import PYLocalFlavorTests
-from se.tests import *
+from .ro.tests import ROLocalFlavorTests
-from si.tests import *
+from .ru.tests import RULocalFlavorTests
-from sk.tests import *
+from .se.tests import SELocalFlavorTests
-from tr.tests import *
+from .si.tests import SILocalFlavorTests
-from us.tests import *
+from .sk.tests import SKLocalFlavorTests
-from uy.tests import *
+from .tr.tests import TRLocalFlavorTests
-from za.tests import *
+from .us.tests import USLocalFlavorTests
+from .uy.tests import UYLocalFlavorTests
+from .za.tests import ZALocalFlavorTests

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):
 

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

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'})

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.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.test import TestCase
+from django.test.utils import override_settings
+from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger
+
 
 
 # logging config prior to using filter with mail_admins

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.

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)
 
 

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

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,
+from .models import (Person, Group, Membership, UserMembership, Car, Driver,
-                    Car, Driver, CarDriver)
+    CarDriver)
 
 
 class M2MThroughTestCase(TestCase):

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')

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):

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):

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')

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):
 

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),

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,
+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):

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 (
+    from .imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests,
-        ImageFieldTests, ImageFieldTwoDimensionsTests, TwoImageFieldTests,
+        TwoImageFieldTests, ImageFieldNoDimensionsTests,
-        ImageFieldNoDimensionsTests, ImageFieldOneDimensionTests,
+        ImageFieldOneDimensionTests, ImageFieldDimensionsFirstTests,
-        ImageFieldDimensionsFirstTests, ImageFieldUsingFileTests)
+        ImageFieldUsingFileTests)
 
 
 class BasicFieldTests(test.TestCase):

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):

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)
 
 

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()

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):

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,

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)
 

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):

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)

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'

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)
 
 

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)

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,
+from .models import Band, Concert, ValidationTestModel, ValidationTestInlineModel
-    ValidationTestInlineModel)
 
 
 class MockRequest(object):

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)

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):

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()
 

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.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):
 

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)

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):
 

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)
 

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):

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)

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):
 

tests/regressiontests/queries/models.py

@@ -6,6 +6,7 @@ import threading
 
 from django.db import models
 
+
 class DumbCategory(models.Model):
     pass
 

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,
+from .models import (Annotation, Article, Author, Celebrity, Child, Cover,
-    DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ, ManagedModel,
+    Detail, DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ,
-    Member, NamedCategory, Note, Number, Plaything, PointerA, Ranking, Related,
+    ManagedModel, Member, NamedCategory, Note, Number, Plaything, PointerA,
-    Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, Node, ObjectA, ObjectB,
+    Ranking, Related, Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten,
-    ObjectC, CategoryItem, SimpleCategory, SpecialCategory, OneToOneCategory)
+    Node, ObjectA, ObjectB, ObjectC, CategoryItem, SimpleCategory,
+    SpecialCategory, OneToOneCategory)
 
 
 class BaseQuerysetTest(TestCase):

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
 

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):

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)

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):
     """

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):

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)
 

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):
 

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.

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

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)
 

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 = []
 

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):

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):

tests/regressiontests/sites_framework/tests.py

@@ -1,8 +1,12 @@
+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):

tests/regressiontests/special_headers/models.py

@@ -1,4 +1,5 @@
 from django.db import models
 
+
 class Article(models.Model):
     text = models.TextField()

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):

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()}),

tests/regressiontests/staticfiles_tests/tests.py

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 from __future__ import with_statement
+
 import codecs
 import os
 import posixpath

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)