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

3 files changed, 1 insertions, 4 deletions

diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index d1308b855e..a56483c3ab 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -100,7 +100,7 @@ __all__ = [
 
 import __future__
 
-import sys, traceback, inspect, linecache, os, re, types
+import sys, traceback, inspect, linecache, os, re
 import unittest, difflib, pdb, tempfile
 import warnings
 from StringIO import StringIO
diff --git a/django/test/client.py b/django/test/client.py
index b02d298418..67d3aa9030 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -1,7 +1,5 @@
-import datetime
 import sys
 from cStringIO import StringIO
-from urlparse import urlparse
 from django.conf import settings
 from django.contrib.auth import authenticate, login
 from django.core.handlers.base import BaseHandler
diff --git a/django/test/simple.py b/django/test/simple.py
index 6fa381ac4d..43e1156a0a 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -146,4 +146,3 @@ def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
     teardown_test_environment()
     
     return len(result.failures) + len(result.errors)
-    
\ No newline at end of file