summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-07-13 09:35:51 +0000
committerJannis Leidel <jannis@leidel.info>2011-07-13 09:35:51 +0000
commit24f4764a48e4141923a78c8820e4cd7b411ec0fc (patch)
treeeed2e98eb3aad1e10c7fda902bc8b875e19929e2 /tests
parent956da729d19d619c210a2466d4435d4967249e7f (diff)
Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/basic/models.py2
-rw-r--r--tests/modeltests/basic/tests.py1
-rw-r--r--tests/modeltests/custom_pk/models.py3
-rw-r--r--tests/modeltests/custom_pk/tests.py3
-rw-r--r--tests/modeltests/delete/models.py2
-rw-r--r--tests/modeltests/field_subclassing/fields.py1
-rw-r--r--tests/modeltests/field_subclassing/models.py2
-rw-r--r--tests/modeltests/files/models.py1
-rw-r--r--tests/modeltests/files/tests.py1
-rw-r--r--tests/modeltests/fixtures/models.py3
-rw-r--r--tests/modeltests/fixtures/tests.py5
-rw-r--r--tests/modeltests/fixtures_model_package/models/__init__.py1
-rw-r--r--tests/modeltests/force_insert_update/models.py2
-rw-r--r--tests/modeltests/get_object_or_404/models.py2
-rw-r--r--tests/modeltests/get_or_create/models.py2
-rw-r--r--tests/modeltests/lookup/models.py3
-rw-r--r--tests/modeltests/lookup/tests.py1
-rw-r--r--tests/modeltests/m2m_through/tests.py4
-rw-r--r--tests/modeltests/many_to_one/tests.py2
-rw-r--r--tests/modeltests/model_forms/models.py1
-rw-r--r--tests/modeltests/model_formsets/tests.py2
-rw-r--r--tests/modeltests/mutually_referential/tests.py2
-rw-r--r--tests/modeltests/one_to_one/models.py2
-rw-r--r--tests/modeltests/pagination/tests.py1
-rw-r--r--tests/modeltests/proxy_model_inheritance/tests.py2
-rw-r--r--tests/modeltests/proxy_models/models.py3
-rw-r--r--tests/modeltests/serializers/tests.py4
-rw-r--r--tests/modeltests/transactions/models.py2
-rw-r--r--tests/modeltests/transactions/tests.py5
-rw-r--r--tests/modeltests/unmanaged_models/tests.py3
-rw-r--r--tests/modeltests/validation/models.py1
-rw-r--r--tests/modeltests/validation/test_unique.py2
-rw-r--r--tests/modeltests/validation/validators.py2
-rw-r--r--tests/regressiontests/admin_filters/tests.py2
-rw-r--r--tests/regressiontests/admin_validation/tests.py7
-rw-r--r--tests/regressiontests/bash_completion/management/commands/test_command.py3
-rw-r--r--tests/regressiontests/cache/tests.py1
-rw-r--r--tests/regressiontests/comment_tests/models.py2
-rw-r--r--tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py10
-rw-r--r--tests/regressiontests/comment_tests/tests/feed_tests.py4
-rw-r--r--tests/regressiontests/comment_tests/tests/templatetag_tests.py1
-rw-r--r--tests/regressiontests/csrf_tests/tests.py1
-rw-r--r--tests/regressiontests/datatypes/tests.py2
-rw-r--r--tests/regressiontests/defer_regress/models.py4
-rw-r--r--tests/regressiontests/defer_regress/tests.py2
-rw-r--r--tests/regressiontests/delete_regress/tests.py4
-rw-r--r--tests/regressiontests/expressions_regress/tests.py3
-rw-r--r--tests/regressiontests/extra_regress/tests.py3
-rw-r--r--tests/regressiontests/file_storage/tests.py2
-rw-r--r--tests/regressiontests/file_uploads/tests.py2
-rw-r--r--tests/regressiontests/fixtures_regress/models.py3
-rw-r--r--tests/regressiontests/fixtures_regress/tests.py5
-rw-r--r--tests/regressiontests/forms/localflavor/cl.py1
-rw-r--r--tests/regressiontests/forms/localflavor/in_.py2
-rw-r--r--tests/regressiontests/forms/tests/fields.py1
-rw-r--r--tests/regressiontests/forms/tests/forms.py3
-rw-r--r--tests/regressiontests/forms/tests/media.py1
-rw-r--r--tests/regressiontests/forms/tests/models.py3
-rw-r--r--tests/regressiontests/forms/tests/widgets.py3
-rw-r--r--tests/regressiontests/generic_relations_regress/tests.py1
-rw-r--r--tests/regressiontests/generic_views/base.py1
-rw-r--r--tests/regressiontests/generic_views/dates.py1
-rw-r--r--tests/regressiontests/generic_views/list.py1
-rw-r--r--tests/regressiontests/i18n/forms.py3
-rw-r--r--tests/regressiontests/i18n/patterns/urls/namespace.py2
-rw-r--r--tests/regressiontests/i18n/patterns/urls/wrong.py2
-rw-r--r--tests/regressiontests/i18n/patterns/urls/wrong_namespace.py2
-rw-r--r--tests/regressiontests/introspection/tests.py3
-rw-r--r--tests/regressiontests/localflavor/tests.py4
-rw-r--r--tests/regressiontests/m2m_through_regress/models.py4
-rw-r--r--tests/regressiontests/max_lengths/tests.py2
-rw-r--r--tests/regressiontests/middleware_exceptions/models.py1
-rw-r--r--tests/regressiontests/model_fields/imagefield.py5
-rw-r--r--tests/regressiontests/model_fields/tests.py12
-rw-r--r--tests/regressiontests/model_forms_regress/tests.py4
-rw-r--r--tests/regressiontests/modeladmin/models.py2
-rw-r--r--tests/regressiontests/multiple_database/models.py1
-rw-r--r--tests/regressiontests/select_related_onetoone/tests.py2
-rw-r--r--tests/regressiontests/serializers_regress/tests.py5
-rw-r--r--tests/regressiontests/signals_regress/tests.py2
-rw-r--r--tests/regressiontests/syndication/tests.py2
-rw-r--r--tests/regressiontests/templates/custom.py2
-rw-r--r--tests/regressiontests/templates/loaders.py2
-rw-r--r--tests/regressiontests/templates/response.py2
-rw-r--r--tests/regressiontests/templates/smartif.py2
-rw-r--r--tests/regressiontests/templates/tests.py6
-rw-r--r--tests/regressiontests/test_utils/tests.py4
-rw-r--r--tests/regressiontests/urlpatterns_reverse/middleware.py2
-rw-r--r--tests/regressiontests/urlpatterns_reverse/tests.py5
-rw-r--r--tests/regressiontests/utils/jslex.py1
-rw-r--r--tests/regressiontests/views/tests/debug.py1
-rw-r--r--tests/regressiontests/views/tests/defaults.py3
92 files changed, 72 insertions, 168 deletions
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index 5f51fd8e11..26fddf0706 100644
--- a/tests/modeltests/basic/models.py
+++ b/tests/modeltests/basic/models.py
@@ -4,7 +4,7 @@
This is a basic model with only two non-primary-key fields.
"""
-from django.db import models, DEFAULT_DB_ALIAS, connection
+from django.db import models
class Article(models.Model):
headline = models.CharField(max_length=100, default='Default headline')
diff --git a/tests/modeltests/basic/tests.py b/tests/modeltests/basic/tests.py
index 966798d78b..ff09d9b5a1 100644
--- a/tests/modeltests/basic/tests.py
+++ b/tests/modeltests/basic/tests.py
@@ -1,7 +1,6 @@
from datetime import datetime
from django.core.exceptions import ObjectDoesNotExist
-from django.db import models, DEFAULT_DB_ALIAS, connection
from django.db.models.fields import FieldDoesNotExist
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
diff --git a/tests/modeltests/custom_pk/models.py b/tests/modeltests/custom_pk/models.py
index ff2f2bac1b..c514fd74c3 100644
--- a/tests/modeltests/custom_pk/models.py
+++ b/tests/modeltests/custom_pk/models.py
@@ -6,8 +6,7 @@ By default, Django adds an ``"id"`` field to each model. But you can override
this behavior by explicitly adding ``primary_key=True`` to a field.
"""
-from django.conf import settings
-from django.db import models, transaction, IntegrityError, DEFAULT_DB_ALIAS
+from django.db import models
from fields import MyAutoField
diff --git a/tests/modeltests/custom_pk/tests.py b/tests/modeltests/custom_pk/tests.py
index c410ad17e3..6b94b6d33f 100644
--- a/tests/modeltests/custom_pk/tests.py
+++ b/tests/modeltests/custom_pk/tests.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
-from django.conf import settings
-from django.db import DEFAULT_DB_ALIAS, transaction, IntegrityError
+from django.db import transaction, IntegrityError
from django.test import TestCase, skipIfDBFeature
from models import Employee, Business, Bar, Foo
diff --git a/tests/modeltests/delete/models.py b/tests/modeltests/delete/models.py
index ee9e99975f..f8b78eb7b7 100644
--- a/tests/modeltests/delete/models.py
+++ b/tests/modeltests/delete/models.py
@@ -1,4 +1,4 @@
-from django.db import models, IntegrityError
+from django.db import models
class R(models.Model):
diff --git a/tests/modeltests/field_subclassing/fields.py b/tests/modeltests/field_subclassing/fields.py
index 309648e3fd..d6e4980c90 100644
--- a/tests/modeltests/field_subclassing/fields.py
+++ b/tests/modeltests/field_subclassing/fields.py
@@ -1,4 +1,3 @@
-from django.core.exceptions import FieldError
from django.db import models
from django.utils import simplejson as json
from django.utils.encoding import force_unicode
diff --git a/tests/modeltests/field_subclassing/models.py b/tests/modeltests/field_subclassing/models.py
index b0d83365c5..c59c0d5d2c 100644
--- a/tests/modeltests/field_subclassing/models.py
+++ b/tests/modeltests/field_subclassing/models.py
@@ -5,7 +5,7 @@ Tests for field subclassing.
from django.db import models
from django.utils.encoding import force_unicode
-from fields import Small, SmallField, SmallerField, JSONField
+from fields import SmallField, SmallerField, JSONField
class MyModel(models.Model):
diff --git a/tests/modeltests/files/models.py b/tests/modeltests/files/models.py
index ca8965e15a..4134472748 100644
--- a/tests/modeltests/files/models.py
+++ b/tests/modeltests/files/models.py
@@ -9,7 +9,6 @@ import random
import tempfile
from django.db import models
-from django.core.files.base import ContentFile
from django.core.files.storage import FileSystemStorage
diff --git a/tests/modeltests/files/tests.py b/tests/modeltests/files/tests.py
index 885f787984..e8e7a761f0 100644
--- a/tests/modeltests/files/tests.py
+++ b/tests/modeltests/files/tests.py
@@ -1,7 +1,6 @@
from __future__ import with_statement
import shutil
-import sys
import tempfile
from django.core.cache import cache
diff --git a/tests/modeltests/fixtures/models.py b/tests/modeltests/fixtures/models.py
index c8fd6a6fac..45f1f69d95 100644
--- a/tests/modeltests/fixtures/models.py
+++ b/tests/modeltests/fixtures/models.py
@@ -8,11 +8,10 @@ in the application directory, or in one of the directories named in the
``FIXTURE_DIRS`` setting.
"""
+from django.db import models
from django.contrib.auth.models import Permission
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
-from django.db import models, DEFAULT_DB_ALIAS
-from django.conf import settings
class Category(models.Model):
diff --git a/tests/modeltests/fixtures/tests.py b/tests/modeltests/fixtures/tests.py
index 31f72f02ca..c335ffbc27 100644
--- a/tests/modeltests/fixtures/tests.py
+++ b/tests/modeltests/fixtures/tests.py
@@ -1,13 +1,10 @@
import StringIO
-import sys
-from django.conf import settings
from django.contrib.sites.models import Site
from django.core import management
-from django.db import DEFAULT_DB_ALIAS
from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
-from models import Article, Blog, Book, Category, Person, Spy, Tag, Visa
+from models import Article, Book, Spy, Tag, Visa
class TestCaseFixtureLoadingTests(TestCase):
diff --git a/tests/modeltests/fixtures_model_package/models/__init__.py b/tests/modeltests/fixtures_model_package/models/__init__.py
index c0450b27bf..5cb0e4a759 100644
--- a/tests/modeltests/fixtures_model_package/models/__init__.py
+++ b/tests/modeltests/fixtures_model_package/models/__init__.py
@@ -1,5 +1,4 @@
from django.db import models
-from django.conf import settings
class Article(models.Model):
headline = models.CharField(max_length=100, default='Default headline')
diff --git a/tests/modeltests/force_insert_update/models.py b/tests/modeltests/force_insert_update/models.py
index 9516be7718..e617aa228a 100644
--- a/tests/modeltests/force_insert_update/models.py
+++ b/tests/modeltests/force_insert_update/models.py
@@ -2,7 +2,7 @@
Tests for forcing insert and update queries (instead of Django's normal
automatic behaviour).
"""
-from django.db import models, transaction, IntegrityError
+from django.db import models
class Counter(models.Model):
name = models.CharField(max_length = 10)
diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/modeltests/get_object_or_404/models.py
index eb3cd8254d..f62dd0cf30 100644
--- a/tests/modeltests/get_object_or_404/models.py
+++ b/tests/modeltests/get_object_or_404/models.py
@@ -11,8 +11,6 @@ performing a ``filter()`` lookup and raising a ``Http404`` exception if a
"""
from django.db import models
-from django.http import Http404
-from django.shortcuts import get_object_or_404, get_list_or_404
class Author(models.Model):
name = models.CharField(max_length=50)
diff --git a/tests/modeltests/get_or_create/models.py b/tests/modeltests/get_or_create/models.py
index db5719b79e..14f55f8d96 100644
--- a/tests/modeltests/get_or_create/models.py
+++ b/tests/modeltests/get_or_create/models.py
@@ -6,7 +6,7 @@ given parameters. If an object isn't found, it creates one with the given
parameters.
"""
-from django.db import models, IntegrityError
+from django.db import models
class Person(models.Model):
first_name = models.CharField(max_length=100)
diff --git a/tests/modeltests/lookup/models.py b/tests/modeltests/lookup/models.py
index d807531850..82434bb81d 100644
--- a/tests/modeltests/lookup/models.py
+++ b/tests/modeltests/lookup/models.py
@@ -4,8 +4,7 @@
This demonstrates features of the database API.
"""
-from django.db import models, DEFAULT_DB_ALIAS, connection
-from django.conf import settings
+from django.db import models
class Author(models.Model):
name = models.CharField(max_length=100)
diff --git a/tests/modeltests/lookup/tests.py b/tests/modeltests/lookup/tests.py
index 3f40bf10f5..b05227c9a1 100644
--- a/tests/modeltests/lookup/tests.py
+++ b/tests/modeltests/lookup/tests.py
@@ -1,7 +1,6 @@
from datetime import datetime
from operator import attrgetter
from django.core.exceptions import FieldError
-from django.db import connection
from django.test import TestCase, skipUnlessDBFeature
from models import Author, Article, Tag
diff --git a/tests/modeltests/m2m_through/tests.py b/tests/modeltests/m2m_through/tests.py
index 807e952949..814e54fc25 100644
--- a/tests/modeltests/m2m_through/tests.py
+++ b/tests/modeltests/m2m_through/tests.py
@@ -3,8 +3,8 @@ from operator import attrgetter
from django.test import TestCase
-from models import Person, Group, Membership, CustomMembership, \
- TestNoDefaultsOrNulls, PersonSelfRefM2M, Friendship
+from models import (Person, Group, Membership, CustomMembership,
+ PersonSelfRefM2M, Friendship)
class M2mThroughTests(TestCase):
diff --git a/tests/modeltests/many_to_one/tests.py b/tests/modeltests/many_to_one/tests.py
index 83e984dc6d..9f60c21f47 100644
--- a/tests/modeltests/many_to_one/tests.py
+++ b/tests/modeltests/many_to_one/tests.py
@@ -2,7 +2,7 @@ from copy import deepcopy
from datetime import datetime
from django.test import TestCase
-from django.core.exceptions import FieldError, MultipleObjectsReturned
+from django.core.exceptions import MultipleObjectsReturned
from models import Article, Reporter
diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py
index 7204b285b7..5dcc0391ce 100644
--- a/tests/modeltests/model_forms/models.py
+++ b/tests/modeltests/model_forms/models.py
@@ -7,7 +7,6 @@ and the examples are probably a poor fit for the ``ModelForm`` syntax. In other
words, most of these tests should be rewritten.
"""
-import os
import tempfile
from django.db import models
diff --git a/tests/modeltests/model_formsets/tests.py b/tests/modeltests/model_formsets/tests.py
index 6303e6d086..34f8d47755 100644
--- a/tests/modeltests/model_formsets/tests.py
+++ b/tests/modeltests/model_formsets/tests.py
@@ -10,7 +10,7 @@ from django.forms.models import (_get_foreign_key, inlineformset_factory,
from django.test import TestCase, skipUnlessDBFeature
from modeltests.model_formsets.models import (
- Author, BetterAuthor, Book, BookWithCustomPK, Editor,
+ Author, BetterAuthor, Book, BookWithCustomPK,
BookWithOptionalAltEditor, AlternateBook, AuthorMeeting, CustomPrimaryKey,
Place, Owner, Location, OwnerProfile, Restaurant, Product, Price,
MexicanRestaurant, ClassyMexicanRestaurant, Repository, Revision,
diff --git a/tests/modeltests/mutually_referential/tests.py b/tests/modeltests/mutually_referential/tests.py
index 101d67cfa6..365c741ea5 100644
--- a/tests/modeltests/mutually_referential/tests.py
+++ b/tests/modeltests/mutually_referential/tests.py
@@ -1,5 +1,5 @@
from django.test import TestCase
-from models import Parent, Child
+from models import Parent
class MutuallyReferentialTests(TestCase):
diff --git a/tests/modeltests/one_to_one/models.py b/tests/modeltests/one_to_one/models.py
index f2637350ca..246c3fc364 100644
--- a/tests/modeltests/one_to_one/models.py
+++ b/tests/modeltests/one_to_one/models.py
@@ -6,7 +6,7 @@ To define a one-to-one relationship, use ``OneToOneField()``.
In this example, a ``Place`` optionally can be a ``Restaurant``.
"""
-from django.db import models, transaction, IntegrityError
+from django.db import models
class Place(models.Model):
name = models.CharField(max_length=50)
diff --git a/tests/modeltests/pagination/tests.py b/tests/modeltests/pagination/tests.py
index eaee466913..11290521bd 100644
--- a/tests/modeltests/pagination/tests.py
+++ b/tests/modeltests/pagination/tests.py
@@ -1,5 +1,4 @@
from datetime import datetime
-from operator import attrgetter
from django.core.paginator import Paginator, InvalidPage, EmptyPage
from django.test import TestCase
diff --git a/tests/modeltests/proxy_model_inheritance/tests.py b/tests/modeltests/proxy_model_inheritance/tests.py
index 7426f41de5..546c5077e2 100644
--- a/tests/modeltests/proxy_model_inheritance/tests.py
+++ b/tests/modeltests/proxy_model_inheritance/tests.py
@@ -9,7 +9,7 @@ apps and calls syncdb, then verifies that the table has been created.
import os
import sys
-from django.conf import settings, Settings
+from django.conf import settings
from django.core.management import call_command
from django.db.models.loading import load_app
from django.test import TransactionTestCase
diff --git a/tests/modeltests/proxy_models/models.py b/tests/modeltests/proxy_models/models.py
index 90d54d94dd..c033117bf8 100644
--- a/tests/modeltests/proxy_models/models.py
+++ b/tests/modeltests/proxy_models/models.py
@@ -4,11 +4,8 @@ they will take data directly from the table of their base class table rather
than using a new table of their own. This allows them to act as simple proxies,
providing a modified interface to the data from the base class.
"""
-
-from django.contrib.contenttypes.models import ContentType
from django.db import models
-
# A couple of managers for testing managing overriding in proxy model cases.
class PersonManager(models.Manager):
diff --git a/tests/modeltests/serializers/tests.py b/tests/modeltests/serializers/tests.py
index 013438ed29..4a7e0a2086 100644
--- a/tests/modeltests/serializers/tests.py
+++ b/tests/modeltests/serializers/tests.py
@@ -9,8 +9,8 @@ from django.db import transaction
from django.test import TestCase, TransactionTestCase, Approximate
from django.utils import simplejson, unittest
-from models import Category, Author, Article, AuthorProfile, Actor, \
- Movie, Score, Player, Team
+from models import (Category, Author, Article, AuthorProfile,
+ Actor, Movie, Score, Player, Team)
class SerializerRegistrationTests(unittest.TestCase):
def setUp(self):
diff --git a/tests/modeltests/transactions/models.py b/tests/modeltests/transactions/models.py
index d957fe174c..b2ae39648a 100644
--- a/tests/modeltests/transactions/models.py
+++ b/tests/modeltests/transactions/models.py
@@ -7,7 +7,7 @@ commit-on-success behavior. Alternatively, you can manage the transaction
manually.
"""
-from django.db import models, DEFAULT_DB_ALIAS
+from django.db import models
class Reporter(models.Model):
first_name = models.CharField(max_length=30)
diff --git a/tests/modeltests/transactions/tests.py b/tests/modeltests/transactions/tests.py
index db58b80e29..5cebe679a4 100644
--- a/tests/modeltests/transactions/tests.py
+++ b/tests/modeltests/transactions/tests.py
@@ -1,9 +1,6 @@
from __future__ import with_statement
-import sys
-
-from django.db import connection, transaction, IntegrityError, DEFAULT_DB_ALIAS
-from django.conf import settings
+from django.db import connection, transaction, IntegrityError
from django.test import TransactionTestCase, skipUnlessDBFeature
from models import Reporter
diff --git a/tests/modeltests/unmanaged_models/tests.py b/tests/modeltests/unmanaged_models/tests.py
index dee3799234..b9817efc08 100644
--- a/tests/modeltests/unmanaged_models/tests.py
+++ b/tests/modeltests/unmanaged_models/tests.py
@@ -1,7 +1,6 @@
from django.test import TestCase
from django.db import connection
-from models import Unmanaged1, Unmanaged2, Managed1
-from models import A01, A02, B01, B02, C01, C02
+from models import A01, A02, B01, B02, C01, C02, Unmanaged2, Managed1
class SimpleTests(TestCase):
diff --git a/tests/modeltests/validation/models.py b/tests/modeltests/validation/models.py
index b2b3ffcd7c..bf0430f79e 100644
--- a/tests/modeltests/validation/models.py
+++ b/tests/modeltests/validation/models.py
@@ -1,7 +1,6 @@
from datetime import datetime
from django.core.exceptions import ValidationError
from django.db import models
-from django.test import TestCase
def validate_answer_to_universe(value):
diff --git a/tests/modeltests/validation/test_unique.py b/tests/modeltests/validation/test_unique.py
index 176a5dba96..c0a0530d6b 100644
--- a/tests/modeltests/validation/test_unique.py
+++ b/tests/modeltests/validation/test_unique.py
@@ -2,9 +2,7 @@ from __future__ import with_statement
import datetime
-from django.conf import settings
from django.core.exceptions import ValidationError
-from django.db import connection
from django.test import TestCase
from django.utils import unittest
diff --git a/tests/modeltests/validation/validators.py b/tests/modeltests/validation/validators.py
index 6a7d833555..30ce66140f 100644
--- a/tests/modeltests/validation/validators.py
+++ b/tests/modeltests/validation/validators.py
@@ -1,5 +1,3 @@
-from django.utils.unittest import TestCase
-
from modeltests.validation import ValidationTestCase
from models import *
diff --git a/tests/regressiontests/admin_filters/tests.py b/tests/regressiontests/admin_filters/tests.py
index 5095abbb9f..b4c4f34e75 100644
--- a/tests/regressiontests/admin_filters/tests.py
+++ b/tests/regressiontests/admin_filters/tests.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
import datetime
from django.core.exceptions import ImproperlyConfigured
diff --git a/tests/regressiontests/admin_validation/tests.py b/tests/regressiontests/admin_validation/tests.py
index 9e50a8b112..d114414135 100644
--- a/tests/regressiontests/admin_validation/tests.py
+++ b/tests/regressiontests/admin_validation/tests.py
@@ -1,9 +1,10 @@
-from django.contrib import admin
from django import forms
-from django.contrib.admin.validation import validate, validate_inline, \
- ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
+from django.contrib import admin
+from django.contrib.admin.validation import validate, validate_inline
+
from models import Song, Book, Album, TwoAlbumFKAndAnE, State, City
class SongForm(forms.ModelForm):
diff --git a/tests/regressiontests/bash_completion/management/commands/test_command.py b/tests/regressiontests/bash_completion/management/commands/test_command.py
index 5cb8820a8f..0f5750645c 100644
--- a/tests/regressiontests/bash_completion/management/commands/test_command.py
+++ b/tests/regressiontests/bash_completion/management/commands/test_command.py
@@ -1,5 +1,4 @@
-import sys, os
-from optparse import OptionParser, make_option
+from optparse import make_option
from django.core.management.base import BaseCommand
diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index d206b462bc..afb5a15b41 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -2,7 +2,6 @@
# Unit tests for cache framework
# Uses whatever cache backend is set in the test settings file.
-from __future__ import with_statement
import hashlib
import os
diff --git a/tests/regressiontests/comment_tests/models.py b/tests/regressiontests/comment_tests/models.py
index 8877ea1155..dc6c842ab6 100644
--- a/tests/regressiontests/comment_tests/models.py
+++ b/tests/regressiontests/comment_tests/models.py
@@ -30,5 +30,5 @@ class Entry(models.Model):
return self.title
class Book(models.Model):
- dewey_decimal = models.DecimalField(primary_key = True, decimal_places=2, max_digits=5)
+ dewey_decimal = models.DecimalField(primary_key=True, decimal_places=2, max_digits=5)
\ No newline at end of file
diff --git a/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py b/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
index 4177163f2a..ac9bde6fed 100644
--- a/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
+++ b/tests/regressiontests/comment_tests/tests/comment_utils_moderators_tests.py
@@ -1,9 +1,11 @@
-from regressiontests.comment_tests.tests import CommentTestCase, CT, Site
-from django.contrib.comments.forms import CommentForm
+from django.core import mail
+
from django.contrib.comments.models import Comment
-from django.contrib.comments.moderation import moderator, CommentModerator, AlreadyModerated
+from django.contrib.comments.moderation import (moderator, CommentModerator,
+ AlreadyModerated)
+
from regressiontests.comment_tests.models import Entry
-from django.core import mail
+from regressiontests.comment_tests.tests import CommentTestCase
class EntryModerator1(CommentModerator):
email_notification = True
diff --git a/tests/regressiontests/comment_tests/tests/feed_tests.py b/tests/regressiontests/comment_tests/tests/feed_tests.py
index 2dccbcd0f7..4497f95c6e 100644
--- a/tests/regressiontests/comment_tests/tests/feed_tests.py
+++ b/tests/regressiontests/comment_tests/tests/feed_tests.py
@@ -1,7 +1,3 @@
-import warnings
-
-from django.test.utils import get_warnings_state, restore_warnings_state
-
from regressiontests.comment_tests.tests import CommentTestCase
diff --git a/tests/regressiontests/comment_tests/tests/templatetag_tests.py b/tests/regressiontests/comment_tests/tests/templatetag_tests.py
index 0ead6c2257..0ee34ac670 100644
--- a/tests/regressiontests/comment_tests/tests/templatetag_tests.py
+++ b/tests/regressiontests/comment_tests/tests/templatetag_tests.py
@@ -1,5 +1,4 @@
from django.contrib.comments.forms import CommentForm
-from django.contrib.comments.models import Comment
from django.contrib.contenttypes.models import ContentType
from django.template import Template, Context
from regressiontests.comment_tests.models import Article, Author
diff --git a/tests/regressiontests/csrf_tests/tests.py b/tests/regressiontests/csrf_tests/tests.py
index b3238a7dd3..c5f9f3632d 100644
--- a/tests/regressiontests/csrf_tests/tests.py
+++ b/tests/regressiontests/csrf_tests/tests.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import with_statement
-import warnings
from django.test import TestCase
from django.http import HttpRequest, HttpResponse
diff --git a/tests/regressiontests/datatypes/tests.py b/tests/regressiontests/datatypes/tests.py
index e161be9344..2d40fecfd1 100644
--- a/tests/regressiontests/datatypes/tests.py
+++ b/tests/regressiontests/datatypes/tests.py
@@ -1,7 +1,5 @@
import datetime
-from django.conf import settings
-from django.db import DEFAULT_DB_ALIAS
from django.test import TestCase, skipIfDBFeature
from django.utils import tzinfo
diff --git a/tests/regressiontests/defer_regress/models.py b/tests/regressiontests/defer_regress/models.py
index 4e4ab0a515..1d1a2247de 100644
--- a/tests/regressiontests/defer_regress/models.py
+++ b/tests/regressiontests/defer_regress/models.py
@@ -2,9 +2,7 @@
Regression tests for defer() / only() behavior.
"""
-from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
-from django.db import connection, models
+from django.db import models
class Item(models.Model):
name = models.CharField(max_length=15)
diff --git a/tests/regressiontests/defer_regress/tests.py b/tests/regressiontests/defer_regress/tests.py
index b1d88e3f36..8bd9579ff4 100644
--- a/tests/regressiontests/defer_regress/tests.py
+++ b/tests/regressiontests/defer_regress/tests.py
@@ -1,9 +1,7 @@
from operator import attrgetter
-from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib.sessions.backends.db import SessionStore
-from django.db import connection
from django.db.models import Count
from django.db.models.loading import cache
from django.test import TestCase
diff --git a/tests/regressiontests/delete_regress/tests.py b/tests/regressiontests/delete_regress/tests.py
index ec26676f1f..22b4833a8f 100644
--- a/tests/regressiontests/delete_regress/tests.py
+++ b/tests/regressiontests/delete_regress/tests.py
@@ -1,11 +1,11 @@
import datetime
from django.conf import settings
-from django.db import backend, connection, transaction, DEFAULT_DB_ALIAS
+from django.db import backend, transaction, DEFAULT_DB_ALIAS
from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
from models import (Book, Award, AwardNote, Person, Child, Toy, PlayedWith,
- PlayedWithNote, Contact, Email, Researcher, Food, Eaten,
+ PlayedWithNote, Email, Researcher, Food, Eaten,
Policy, Version, Location, Item)
diff --git a/tests/regressiontests/expressions_regress/tests.py b/tests/regressiontests/expressions_regress/tests.py
index a900c6c5fd..497a8439b5 100644
--- a/tests/regressiontests/expressions_regress/tests.py
+++ b/tests/regressiontests/expressions_regress/tests.py
@@ -3,8 +3,7 @@ Spanning tests for all the operations that F() expressions can perform.
"""
import datetime
-from django.conf import settings
-from django.db import models, connection
+from django.db import connection
from django.db.models import F
from django.test import TestCase, Approximate, skipUnlessDBFeature
diff --git a/tests/regressiontests/extra_regress/tests.py b/tests/regressiontests/extra_regress/tests.py
index ef7cbb8b9b..5f779be751 100644
--- a/tests/regressiontests/extra_regress/tests.py
+++ b/tests/regressiontests/extra_regress/tests.py
@@ -3,8 +3,7 @@ from django.test import TestCase
from django.utils.datastructures import SortedDict
from django.contrib.auth.models import User
-from regressiontests.extra_regress.models import TestObject, Order, \
- RevisionableModel
+from regressiontests.extra_regress.models import TestObject, Order, RevisionableModel
import datetime
diff --git a/tests/regressiontests/file_storage/tests.py b/tests/regressiontests/file_storage/tests.py
index 917d2f36fc..40710ebd5d 100644
--- a/tests/regressiontests/file_storage/tests.py
+++ b/tests/regressiontests/file_storage/tests.py
@@ -18,7 +18,7 @@ except ImportError:
from django.conf import settings
from django.core.exceptions import SuspiciousOperation, ImproperlyConfigured
-from django.core.files.base import ContentFile, File
+from django.core.files.base import ContentFile
from django.core.files.images import get_image_dimensions
from django.core.files.storage import FileSystemStorage, get_storage_class
from django.core.files.uploadedfile import UploadedFile
diff --git a/tests/regressiontests/file_uploads/tests.py b/tests/regressiontests/file_uploads/tests.py
index 6d79e2a451..2be423e028 100644
--- a/tests/regressiontests/file_uploads/tests.py
+++ b/tests/regressiontests/file_uploads/tests.py
@@ -9,7 +9,7 @@ from StringIO import StringIO
from django.core.files import temp as tempfile
from django.core.files.uploadedfile import SimpleUploadedFile
-from django.http.multipartparser import MultiPartParser, MultiPartParserError
+from django.http.multipartparser import MultiPartParser
from django.test import TestCase, client
from django.utils import simplejson
from django.utils import unittest
diff --git a/tests/regressiontests/fixtures_regress/models.py b/tests/regressiontests/fixtures_regress/models.py
index 2dfb55035a..b353f80940 100644
--- a/tests/regressiontests/fixtures_regress/models.py
+++ b/tests/regressiontests/fixtures_regress/models.py
@@ -1,6 +1,5 @@
-from django.db import models, DEFAULT_DB_ALIAS, connection
+from django.db import models
from django.contrib.auth.models import User
-from django.conf import settings
class Animal(models.Model):
diff --git a/tests/regressiontests/fixtures_regress/tests.py b/tests/regressiontests/fixtures_regress/tests.py
index 3dc4edee55..a565ec96e0 100644
--- a/tests/regressiontests/fixtures_regress/tests.py
+++ b/tests/regressiontests/fixtures_regress/tests.py
@@ -2,7 +2,6 @@
# Unittests for fixtures.
import os
import re
-import sys
try:
from cStringIO import StringIO
except ImportError:
@@ -13,8 +12,8 @@ from django.core.management.commands.dumpdata import sort_dependencies
from django.core.management.base import CommandError
from django.db.models import signals
from django.db import transaction
-from django.test import TestCase, TransactionTestCase, skipIfDBFeature, \
- skipUnlessDBFeature
+from django.test import (TestCase, TransactionTestCase, skipIfDBFeature,
+ skipUnlessDBFeature)
from models import Animal, Stuff
from models import Absolute, Parent, Child
diff --git a/tests/regressiontests/forms/localflavor/cl.py b/tests/regressiontests/forms/localflavor/cl.py
index b2b4562a53..59e4824db9 100644
--- a/tests/regressiontests/forms/localflavor/cl.py
+++ b/tests/regressiontests/forms/localflavor/cl.py
@@ -1,5 +1,4 @@
from django.contrib.localflavor.cl.forms import CLRutField, CLRegionSelect
-from django.core.exceptions import ValidationError
from utils import LocalFlavorTestCase
diff --git a/tests/regressiontests/forms/localflavor/in_.py b/tests/regressiontests/forms/localflavor/in_.py
index 5a04fd1cf4..583998283d 100644
--- a/tests/regressiontests/forms/localflavor/in_.py
+++ b/tests/regressiontests/forms/localflavor/in_.py
@@ -1,5 +1,3 @@
-import warnings
-
from django.contrib.localflavor.in_.forms import (INZipCodeField,
INStateField, INStateSelect, INPhoneNumberField)
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py
index 67804134ac..506844d848 100644
--- a/tests/regressiontests/forms/tests/fields.py
+++ b/tests/regressiontests/forms/tests/fields.py
@@ -33,7 +33,6 @@ from functools import wraps
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import *
-from django.forms.widgets import RadioFieldRenderer
from django.utils.unittest import TestCase
diff --git a/tests/regressiontests/forms/tests/forms.py b/tests/regressiontests/forms/tests/forms.py
index 04463cfb2c..ed783af819 100644
--- a/tests/regressiontests/forms/tests/forms.py
+++ b/tests/regressiontests/forms/tests/forms.py
@@ -1,8 +1,5 @@
# -*- coding: utf-8 -*-
import datetime
-from decimal import Decimal
-import re
-import time
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import *
from django.http import QueryDict
diff --git a/tests/regressiontests/forms/tests/media.py b/tests/regressiontests/forms/tests/media.py
index bed5a816bf..71dc0a7b03 100644
--- a/tests/regressiontests/forms/tests/media.py
+++ b/tests/regressiontests/forms/tests/media.py
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-from django.conf import settings
from django.forms import TextInput, Media, TextInput, CharField, Form, MultiWidget
from django.test import TestCase
from django.test.utils import override_settings
diff --git a/tests/regressiontests/forms/tests/models.py b/tests/regressiontests/forms/tests/models.py
index 3f548df982..5e1bd82640 100644
--- a/tests/regressiontests/forms/tests/models.py
+++ b/tests/regressiontests/forms/tests/models.py
@@ -3,7 +3,8 @@ import datetime
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import Form, ModelForm, FileField, ModelChoiceField
from django.test import TestCase
-from regressiontests.forms.models import ChoiceModel, ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, BoundaryModel, Defaults
+from regressiontests.forms.models import (ChoiceOptionModel, ChoiceFieldModel,
+ FileModel, Group, BoundaryModel, Defaults)
class ChoiceFieldForm(ModelForm):
diff --git a/tests/regressiontests/forms/tests/widgets.py b/tests/regressiontests/forms/tests/widgets.py
index 0a8a87949c..b4ceb2fcff 100644
--- a/tests/regressiontests/forms/tests/widgets.py
+++ b/tests/regressiontests/forms/tests/widgets.py
@@ -2,9 +2,6 @@
import copy
import datetime
-import re
-import time
-from decimal import Decimal
from django.conf import settings
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import *
diff --git a/tests/regressiontests/generic_relations_regress/tests.py b/tests/regressiontests/generic_relations_regress/tests.py
index 45e86746e5..52731a9a43 100644
--- a/tests/regressiontests/generic_relations_regress/tests.py
+++ b/tests/regressiontests/generic_relations_regress/tests.py
@@ -1,5 +1,4 @@
from django.test import TestCase
-from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from models import *
diff --git a/tests/regressiontests/generic_views/base.py b/tests/regressiontests/generic_views/base.py
index fc5cf62e43..40490a421c 100644
--- a/tests/regressiontests/generic_views/base.py
+++ b/tests/regressiontests/generic_views/base.py
@@ -4,7 +4,6 @@ import unittest
from django.core.exceptions import ImproperlyConfigured
from django.http import HttpResponse
from django.test import TestCase, RequestFactory
-from django.utils import simplejson
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 5b784f6810..b9608d694f 100644
--- a/tests/regressiontests/generic_views/dates.py
+++ b/tests/regressiontests/generic_views/dates.py
@@ -1,5 +1,4 @@
import datetime
-import random
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
diff --git a/tests/regressiontests/generic_views/list.py b/tests/regressiontests/generic_views/list.py
index c41680c701..f5bf910894 100644
--- a/tests/regressiontests/generic_views/list.py
+++ b/tests/regressiontests/generic_views/list.py
@@ -2,7 +2,6 @@ from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
from regressiontests.generic_views.models import Author, Artist
-from regressiontests.generic_views.views import CustomPaginator
class ListViewTests(TestCase):
fixtures = ['generic-views-test-data.json']
diff --git a/tests/regressiontests/i18n/forms.py b/tests/regressiontests/i18n/forms.py
index 156441c6ab..600f252aa5 100644
--- a/tests/regressiontests/i18n/forms.py
+++ b/tests/regressiontests/i18n/forms.py
@@ -1,5 +1,6 @@
-from django import template, forms
+from django import forms
from django.forms.extras import SelectDateWidget
+
from models import Company
class I18nForm(forms.Form):
diff --git a/tests/regressiontests/i18n/patterns/urls/namespace.py b/tests/regressiontests/i18n/patterns/urls/namespace.py
index 878e08feae..0e703405cb 100644
--- a/tests/regressiontests/i18n/patterns/urls/namespace.py
+++ b/tests/regressiontests/i18n/patterns/urls/namespace.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls.defaults import patterns, url
from django.utils.translation import ugettext_lazy as _
from django.views.generic import TemplateView
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong.py b/tests/regressiontests/i18n/patterns/urls/wrong.py
index 3e45743cdf..40302fc98f 100644
--- a/tests/regressiontests/i18n/patterns/urls/wrong.py
+++ b/tests/regressiontests/i18n/patterns/urls/wrong.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls.defaults import include, url
from django.conf.urls.i18n import i18n_patterns
from django.utils.translation import ugettext_lazy as _
diff --git a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py b/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py
index 90ee2a0538..46ecfd0e7a 100644
--- a/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py
+++ b/tests/regressiontests/i18n/patterns/urls/wrong_namespace.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, url
+from django.conf.urls.defaults import url
from django.conf.urls.i18n import i18n_patterns
from django.utils.translation import ugettext_lazy as _
from django.views.generic import TemplateView
diff --git a/tests/regressiontests/introspection/tests.py b/tests/regressiontests/introspection/tests.py
index e309a98681..4f5fb09193 100644
--- a/tests/regressiontests/introspection/tests.py
+++ b/tests/regressiontests/introspection/tests.py
@@ -1,6 +1,5 @@
from functools import update_wrapper
-from django.conf import settings
-from django.db import connection, DEFAULT_DB_ALIAS
+from django.db import connection
from django.test import TestCase, skipUnlessDBFeature
from models import Reporter, Article
diff --git a/tests/regressiontests/localflavor/tests.py b/tests/regressiontests/localflavor/tests.py
index 6a02d99004..6a15d463f7 100644
--- a/tests/regressiontests/localflavor/tests.py
+++ b/tests/regressiontests/localflavor/tests.py
@@ -1,7 +1,3 @@
-from django.test import TestCase
-from django.utils import unittest
-
-# just import your tests here
from au.tests import *
from mk.tests import *
from us.tests import *
diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/regressiontests/m2m_through_regress/models.py
index 121ef22470..9eea2f4604 100644
--- a/tests/regressiontests/m2m_through_regress/models.py
+++ b/tests/regressiontests/m2m_through_regress/models.py
@@ -1,8 +1,6 @@
-from datetime import datetime
+from django.db import models
from django.contrib.auth.models import User
-from django.core import management
-from django.db import models
# Forward declared intermediate model
diff --git a/tests/regressiontests/max_lengths/tests.py b/tests/regressiontests/max_lengths/tests.py
index 59d98d6b8e..4d1f2bff9a 100644
--- a/tests/regressiontests/max_lengths/tests.py
+++ b/tests/regressiontests/max_lengths/tests.py
@@ -1,5 +1,5 @@
-from django.db import DatabaseError
from django.utils import unittest
+
from regressiontests.max_lengths.models import PersonWithDefaultMaxLengths, PersonWithCustomMaxLengths
class MaxLengthArgumentsTests(unittest.TestCase):
diff --git a/tests/regressiontests/middleware_exceptions/models.py b/tests/regressiontests/middleware_exceptions/models.py
index 137941ffae..e69de29bb2 100644
--- a/tests/regressiontests/middleware_exceptions/models.py
+++ b/tests/regressiontests/middleware_exceptions/models.py
@@ -1 +0,0 @@
-from django.db import models
diff --git a/tests/regressiontests/model_fields/imagefield.py b/tests/regressiontests/model_fields/imagefield.py
index dd79e7aefa..c952aa981a 100644
--- a/tests/regressiontests/model_fields/imagefield.py
+++ b/tests/regressiontests/model_fields/imagefield.py
@@ -2,12 +2,11 @@ import os
import shutil
from django.core.files import File
-from django.core.files.base import ContentFile
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.
diff --git a/tests/regressiontests/model_fields/tests.py b/tests/regressiontests/model_fields/tests.py
index b42c0af784..4944db78e8 100644
--- a/tests/regressiontests/model_fields/tests.py
+++ b/tests/regressiontests/model_fields/tests.py
@@ -12,14 +12,10 @@ from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanM
# If PIL available, do these tests.
if Image:
- from imagefield import \
- ImageFieldTests, \
- ImageFieldTwoDimensionsTests, \
- ImageFieldNoDimensionsTests, \
- ImageFieldOneDimensionTests, \
- ImageFieldDimensionsFirstTests, \
- ImageFieldUsingFileTests, \
- TwoImageFieldTests
+ from imagefield import (
+ ImageFieldTests, ImageFieldTwoDimensionsTests, TwoImageFieldTests,
+ ImageFieldNoDimensionsTests, ImageFieldOneDimensionTests,
+ ImageFieldDimensionsFirstTests, ImageFieldUsingFileTests)
class BasicFieldTests(test.TestCase):
diff --git a/tests/regressiontests/model_forms_regress/tests.py b/tests/regressiontests/model_forms_regress/tests.py
index 9817858afc..9860c2e1ad 100644
--- a/tests/regressiontests/model_forms_regress/tests.py
+++ b/tests/regressiontests/model_forms_regress/tests.py
@@ -8,8 +8,8 @@ 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, \
- Publication, CustomFF, Author, Author1, Homepage, Document, Edition
+from models import (Person, RealPerson, Triple, FilePathModel, Article,
+ Publication, CustomFF, Author, Author1, Homepage, Document, Edition)
class ModelMultipleChoiceFieldTests(TestCase):
diff --git a/tests/regressiontests/modeladmin/models.py b/tests/regressiontests/modeladmin/models.py
index 26eaaae07d..ae180a4936 100644
--- a/tests/regressiontests/modeladmin/models.py
+++ b/tests/regressiontests/modeladmin/models.py
@@ -1,6 +1,4 @@
# coding: utf-8
-from datetime import date
-
from django.db import models
from django.contrib.auth.models import User
diff --git a/tests/regressiontests/multiple_database/models.py b/tests/regressiontests/multiple_database/models.py
index ce71828700..8146c57ccb 100644
--- a/tests/regressiontests/multiple_database/models.py
+++ b/tests/regressiontests/multiple_database/models.py
@@ -1,4 +1,3 @@
-from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic
diff --git a/tests/regressiontests/select_related_onetoone/tests.py b/tests/regressiontests/select_related_onetoone/tests.py
index ab35feccf1..3e7023acdf 100644
--- a/tests/regressiontests/select_related_onetoone/tests.py
+++ b/tests/regressiontests/select_related_onetoone/tests.py
@@ -1,5 +1,3 @@
-from django import db
-from django.conf import settings
from django.test import TestCase
from models import (User, UserProfile, UserStat, UserStatResult, StatDetails,
diff --git a/tests/regressiontests/serializers_regress/tests.py b/tests/regressiontests/serializers_regress/tests.py
index 90a438c43a..cd2ce3cc9a 100644
--- a/tests/regressiontests/serializers_regress/tests.py
+++ b/tests/regressiontests/serializers_regress/tests.py
@@ -15,10 +15,9 @@ try:
except ImportError:
from StringIO import StringIO
-from django.conf import settings
-from django.core import serializers, management
+from django.core import serializers
from django.core.serializers import SerializerDoesNotExist
-from django.db import transaction, DEFAULT_DB_ALIAS, connection
+from django.db import connection
from django.test import TestCase
from django.utils.functional import curry
diff --git a/tests/regressiontests/signals_regress/tests.py b/tests/regressiontests/signals_regress/tests.py
index 630b16fda4..332f5d9f5b 100644
--- a/tests/regressiontests/signals_regress/tests.py
+++ b/tests/regressiontests/signals_regress/tests.py
@@ -1,5 +1,3 @@
-import sys
-from StringIO import StringIO
from django.test import TestCase
from django.db import models
diff --git a/tests/regressiontests/syndication/tests.py b/tests/regressiontests/syndication/tests.py
index 2f90dc0348..66432981dd 100644
--- a/tests/regressiontests/syndication/tests.py
+++ b/tests/regressiontests/syndication/tests.py
@@ -1,5 +1,3 @@
-import datetime
-import warnings
from xml.dom import minidom
from django.contrib.syndication import views
diff --git a/tests/regressiontests/templates/custom.py b/tests/regressiontests/templates/custom.py
index 74c39ab7e0..d781874436 100644
--- a/tests/regressiontests/templates/custom.py
+++ b/tests/regressiontests/templates/custom.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from django import template
from django.utils.unittest import TestCase
from templatetags import custom
diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py
index 1773592521..c2ae0bd1fc 100644
--- a/tests/regressiontests/templates/loaders.py
+++ b/tests/regressiontests/templates/loaders.py
@@ -14,12 +14,10 @@ import pkg_resources
import imp
import StringIO
import os.path
-import warnings
from django.template import TemplateDoesNotExist, Context
from django.template.loaders.eggs import Loader as EggLoader
from django.template import loader
-from django.test.utils import get_warnings_state, restore_warnings_state
from django.utils import unittest
diff --git a/tests/regressiontests/templates/response.py b/tests/regressiontests/templates/response.py
index 6fc2dedcf4..a1257fee23 100644
--- a/tests/regressiontests/templates/response.py
+++ b/tests/regressiontests/templates/response.py
@@ -6,7 +6,7 @@ from django.utils import unittest
from django.test import RequestFactory, TestCase
from django.conf import settings
import django.template.context
-from django.template import Template, Context, RequestContext
+from django.template import Template, Context
from django.template.response import (TemplateResponse, SimpleTemplateResponse,
ContentNotRenderedError)
diff --git a/tests/regressiontests/templates/smartif.py b/tests/regressiontests/templates/smartif.py
index 2ce2df3c91..3a705ca663 100644
--- a/tests/regressiontests/templates/smartif.py
+++ b/tests/regressiontests/templates/smartif.py
@@ -1,4 +1,4 @@
-from django.template.smartif import IfParser, Literal
+from django.template.smartif import IfParser
from django.utils import unittest
class SmartIfTests(unittest.TestCase):
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index 8ea462e378..2481792db9 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -15,12 +15,12 @@ import warnings
from urlparse import urljoin
from django import template
-from django.template import base as template_base
+from django.template import base as template_base, RequestContext
from django.core import urlresolvers
from django.template import loader
from django.template.loaders import app_directories, filesystem, cached
-from django.test.utils import get_warnings_state, restore_warnings_state,\
- setup_test_template_loader, restore_template_loaders
+from django.test.utils import (get_warnings_state, restore_warnings_state,
+ setup_test_template_loader, restore_template_loaders)
from django.utils import unittest
from django.utils.formats import date_format
from django.utils.translation import activate, deactivate, ugettext as _
diff --git a/tests/regressiontests/test_utils/tests.py b/tests/regressiontests/test_utils/tests.py
index 673295be37..a35b0bcd04 100644
--- a/tests/regressiontests/test_utils/tests.py
+++ b/tests/regressiontests/test_utils/tests.py
@@ -1,8 +1,6 @@
from __future__ import with_statement
-import sys
-
-from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
+from django.test import TestCase, skipUnlessDBFeature
from django.utils.unittest import skip
from models import Person
diff --git a/tests/regressiontests/urlpatterns_reverse/middleware.py b/tests/regressiontests/urlpatterns_reverse/middleware.py
index cd3c045159..7bc42f8df4 100644
--- a/tests/regressiontests/urlpatterns_reverse/middleware.py
+++ b/tests/regressiontests/urlpatterns_reverse/middleware.py
@@ -1,5 +1,3 @@
-from django.core.urlresolvers import set_urlconf
-
import urlconf_inner
class ChangeURLconfMiddleware(object):
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index f447adf4cc..63ca6f5140 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -3,9 +3,8 @@ Unit tests for reverse URL lookups.
"""
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
-from django.core.urlresolvers import reverse, resolve, NoReverseMatch,\
- Resolver404, ResolverMatch,\
- RegexURLResolver, RegexURLPattern
+from django.core.urlresolvers import (reverse, resolve, NoReverseMatch,
+ Resolver404, ResolverMatch, RegexURLResolver, RegexURLPattern)
from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
from django.shortcuts import redirect
from django.test import TestCase
diff --git a/tests/regressiontests/utils/jslex.py b/tests/regressiontests/utils/jslex.py
index 08e8386831..7cd93ca36d 100644
--- a/tests/regressiontests/utils/jslex.py
+++ b/tests/regressiontests/utils/jslex.py
@@ -2,7 +2,6 @@
# encoding: utf-8
# originally from https://bitbucket.org/ned/jslex
-import difflib
from django.test import TestCase
from django.utils.jslex import JsLexer, prepare_js_for_gettext
diff --git a/tests/regressiontests/views/tests/debug.py b/tests/regressiontests/views/tests/debug.py
index 79af253d7c..012c1c6f90 100644
--- a/tests/regressiontests/views/tests/debug.py
+++ b/tests/regressiontests/views/tests/debug.py
@@ -9,7 +9,6 @@ from django.test import TestCase, RequestFactory
from django.core.urlresolvers import reverse
from django.template import TemplateSyntaxError
from django.views.debug import ExceptionReporter
-from django.core.exceptions import ImproperlyConfigured
from django.core import mail
from regressiontests.views import BrokenException, except_args
diff --git a/tests/regressiontests/views/tests/defaults.py b/tests/regressiontests/views/tests/defaults.py
index c7c295a642..6378cf9c99 100644
--- a/tests/regressiontests/views/tests/defaults.py
+++ b/tests/regressiontests/views/tests/defaults.py
@@ -1,6 +1,3 @@
-from os import path
-
-from django.conf import settings
from django.test import TestCase
from django.contrib.contenttypes.models import ContentType