Merge pull request #89 from cjwatson/drop-mock

Drop support for external mock package

README.rst

@@ -403,7 +403,7 @@ existing handlers are removed and replaced by the provided handler, while if
 ``MockPatchObject``
 +++++++++++++++++++
 
-Adapts ``mock.patch.object`` to be used as a fixture:
+Adapts ``unittest.mock.patch.object`` to be used as a fixture:
 
 .. code-block:: python
 
@@ -419,7 +419,7 @@ Adapts ``mock.patch.object`` to be used as a fixture:
 ``MockPatch``
 +++++++++++++
 
-Adapts ``mock.patch`` to be used as a fixture:
+Adapts ``unittest.mock.patch`` to be used as a fixture:
 
 .. code-block:: python
 
@@ -428,7 +428,7 @@ Adapts ``mock.patch`` to be used as a fixture:
 ``MockPatchMultiple``
 +++++++++++++++++++++
 
-Adapts ``mock.patch.multiple`` to be used as a ``fixture``:
+Adapts ``unittest.mock.patch.multiple`` to be used as a ``fixture``:
 
 .. code-block:: python
 

fixtures/_fixtures/mockpatch.py

@@ -15,13 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import fixtures
+import unittest.mock as mock
 
-# TODO(stephenfin): Make this configurable
-try:
-    import mock
-except ImportError:
-    import unittest.mock as mock
+import fixtures
 
 
 class _Base(fixtures.Fixture):

fixtures/tests/_fixtures/test_mockpatch.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 
-import mock  # Yes, we only test the rolling backport
 import testtools
+from unittest import mock
 
 from fixtures import (
     MockPatch,

setup.cfg

@@ -34,7 +34,6 @@ packages =
 streams =
     testtools
 test =
-    mock
     testtools
 docs =
     docutils