Fixed #14487 -- Prevented unittest from leaking into scope via a 'from django.test.testcases import *' import. Thanks to Jannis for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14258 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 9 insertions, 3 deletions

diff --git a/django/test/client.py b/django/test/client.py
index f93664f6cb..0625f23f79 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -26,6 +26,8 @@ from django.utils.itercompat import is_iterable
 from django.db import transaction, close_connection
 from django.test.utils import ContextList
 
+all = ('Client', 'RequestFactory', 'encode_file', 'encode_multipart')
+
 BOUNDARY = 'BoUnDaRyStRiNg'
 MULTIPART_CONTENT = 'multipart/form-data; boundary=%s' % BOUNDARY
 CONTENT_TYPE_RE = re.compile('.*; charset=([\w\d-]+);?')
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 764ba41371..e34262bfe5 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -11,10 +11,12 @@ from django.db import transaction, connection, connections, DEFAULT_DB_ALIAS
 from django.http import QueryDict
 from django.test import _doctest as doctest
 from django.test.client import Client
-from django.utils import simplejson, unittest
+from django.utils import simplejson, unittest as ut2
 from django.utils.encoding import smart_str
 from django.utils.functional import wraps
 
+__all__ = ('DocTestRunner', 'OutputChecker', 'TestCase', 'TransactionTestCase',
+           'skipIfDBFeature', 'skipUnlessDBFeature')
 
 try:
     all
@@ -233,7 +235,7 @@ class _AssertNumQueriesContext(object):
         )
 
 
-class TransactionTestCase(unittest.TestCase):
+class TransactionTestCase(ut2.TestCase):
     # The class we'll use for the test client self.client.
     # Can be overridden in derived classes.
     client_class = Client
@@ -581,7 +583,7 @@ def _deferredSkip(condition, reason):
             @wraps(test_func)
             def skip_wrapper(*args, **kwargs):
                 if condition():
-                    raise unittest.SkipTest(reason)
+                    raise ut2.SkipTest(reason)
                 return test_func(*args, **kwargs)
             test_item = skip_wrapper
         else:
diff --git a/django/test/utils.py b/django/test/utils.py
index 8ecb5a0e60..d2649ae96b 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -8,6 +8,8 @@ from django.test import signals
 from django.template import Template
 from django.utils.translation import deactivate
 
+all = ('Approximate', 'ContextList', 'setup_test_environment',
+       'teardown_test_environment', 'get_runner')
 
 class Approximate(object):
     def __init__(self, val, places=7):