summaryrefslogtreecommitdiff
path: root/django/test/__init__.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-29 11:45:06 -0500
committerTim Graham <timograham@gmail.com>2014-12-01 16:08:25 -0500
commit82e4f956e3faa4a48fe3c90e02673c1a916d6943 (patch)
treeaa8aaeb1a2aaa1dc9ccad5f764ff10b4abf6dc49 /django/test/__init__.py
parent43fcf3505eb22228f551ab03122f99b3d40f38ed (diff)
Fixed #23289 -- Added mock as a test dependency.
Diffstat (limited to 'django/test/__init__.py')
-rw-r--r--django/test/__init__.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/django/test/__init__.py b/django/test/__init__.py
index 32608a94f2..b65601b12d 100644
--- a/django/test/__init__.py
+++ b/django/test/__init__.py
@@ -16,3 +16,12 @@ __all__ = [
'skipUnlessDBFeature', 'modify_settings', 'override_settings',
'override_system_checks'
]
+
+# To simplify Django's test suite; not meant as a public API
+try:
+ from unittest import mock # NOQA
+except ImportError:
+ try:
+ import mock # NOQA
+ except ImportError:
+ pass