summaryrefslogtreecommitdiff
path: root/fixtures/tests
diff options
context:
space:
mode:
authorRobert Collins <robertc@robertcollins.net>2015-10-07 23:54:28 +0000
committerRobert Collins <robertc@robertcollins.net>2015-10-08 13:13:11 +1300
commit5522eb9263e611803868b564bf4216f36e079580 (patch)
treebd559caa8fda0e99fa02150d1dba4e19f1fe8f5a /fixtures/tests
parent20cd3e04587365db32f90c402cc855d2383d5e4d (diff)
downloadfixtures-git-5522eb9263e611803868b564bf4216f36e079580.tar.gz
Use mock in preference to unittest.mock.
If folk have installed both, they probably want the bugfixes from the rolling backport vs the potentially stale Python 3.3 or 3.4 etc version.
Diffstat (limited to 'fixtures/tests')
-rw-r--r--fixtures/tests/_fixtures/test_mockpatch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/fixtures/tests/_fixtures/test_mockpatch.py b/fixtures/tests/_fixtures/test_mockpatch.py
index 4f48aa9..97d1eb7 100644
--- a/fixtures/tests/_fixtures/test_mockpatch.py
+++ b/fixtures/tests/_fixtures/test_mockpatch.py
@@ -14,7 +14,7 @@
import extras
-mock = extras.try_imports(['unittest.mock', 'mock'], None)
+import mock # Yes, we only test the rolling backport
import testtools
from fixtures import (