summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorKevin Christopher Henry <k@severian.com>2013-09-09 04:59:47 -0400
committerTim Graham <timograham@gmail.com>2013-09-09 16:03:13 -0400
commit9d700322b38ea670800a97f2b92dd2fc2c6ff28d (patch)
tree03972a5cf4a8b5eeb69909ddacbe33eeae1d2efd /django
parenta52cc1c0888c2cedb07b2c0619c1a92a2f6e2c40 (diff)
Fixed #19885 -- cleaned up the django.test namespace
* override_settings may now be imported from django.test * removed Approximate from django.test * updated documentation for things importable from django.test Thanks akaariai for the suggestion.
Diffstat (limited to 'django')
-rw-r--r--django/test/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/test/__init__.py b/django/test/__init__.py
index 7a4987508e..58d54df5e2 100644
--- a/django/test/__init__.py
+++ b/django/test/__init__.py
@@ -7,4 +7,4 @@ from django.test.testcases import (TestCase, TransactionTestCase,
SimpleTestCase, LiveServerTestCase, skipIfDBFeature,
skipUnlessDBFeature
)
-from django.test.utils import Approximate
+from django.test.utils import override_settings