gis: Merged revisions 7105-7168 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7176 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 0 insertions, 6 deletions

diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py
index bd0ce5cbb7..66583dde95 100644
--- a/django/contrib/formtools/preview.py
+++ b/django/contrib/formtools/preview.py
@@ -3,7 +3,6 @@ Formtools Preview application.
 """
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 from django.http import Http404
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
diff --git a/django/contrib/formtools/tests.py b/django/contrib/formtools/tests.py
index a5a9222c46..feda6e041e 100644
--- a/django/contrib/formtools/tests.py
+++ b/django/contrib/formtools/tests.py
@@ -3,8 +3,6 @@ from django.contrib.formtools import preview
 from django import http
 from django.conf import settings
 from django.test import TestCase
-from django.test.client import Client
-
 
 success_string = "Done was called!"
 test_data = {'field1': u'foo',
@@ -88,6 +86,3 @@ class PreviewTests(TestCase):
         response = self.client.post('/test1/', test_data)
         self.assertEqual(response.content, success_string)
 
-
-if __name__ == '__main__':
-    unittest.main()