TEST: Move from mock to unittest.mock

Author: effigies

dev-requirements.txt

@@ -1,4 +1,3 @@
 # Requirements for running tests
 -r requirements.txt
 nose
-mock

doc-requirements.txt

@@ -4,4 +4,3 @@ sphinx
 numpydoc
 texext
 matplotlib>=1.3
-mock

doc/source/installation.rst

@@ -89,7 +89,6 @@ Requirements
 *  PyDICOM_ 0.9.9 or greater (optional, for DICOM support)
 *  `Python Imaging Library`_ (optional, for PNG conversion in DICOMFS)
 *  nose_ 0.11 or greater (optional, to run the tests)
-*  mock_ (optional, to run the tests)
 *  sphinx_ (optional, to build the documentation)
 
 Get the development sources

doc/source/links_names.txt

@@ -83,7 +83,6 @@
 .. _emacs_python_mode: http://www.emacswiki.org/cgi-bin/wiki/PythonMode
 .. _doctest-mode: http://ed.loper.org/projects/doctestmode/
 .. _nose: http://somethingaboutorange.com/mrl/projects/nose
-.. _mock: https://github.com/testing-cabal/mock
 .. _`python coverage tester`: http://nedbatchelder.com/code/coverage/
 .. _bitbucket: https://bitbucket.org
 .. _six: http://pythonhosted.org/six

nibabel/__init__.py

@@ -92,18 +92,10 @@ def teardown_package():
 from . import streamlines
 from . import viewers
 
-import pkgutil
-
-if not pkgutil.find_loader('mock'):
-    def test(*args, **kwargs):
-        raise RuntimeError('Need "mock" package for tests')
-else:
-    from numpy.testing import Tester
-    test = Tester().test
-    bench = Tester().bench
-    del Tester
-
-del pkgutil
+from numpy.testing import Tester
+test = Tester().test
+bench = Tester().bench
+del Tester
 
 from .pkg_info import get_pkg_info as _get_pkg_info
 

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -18,7 +18,7 @@
 import gc
 import itertools as it
 import numpy as np
-import mock
+from unittest import mock
 
 import nibabel as nib
 from nibabel.tmpdirs import InTemporaryDirectory

nibabel/cmdline/tests/test_parrec2nii.py

@@ -8,7 +8,7 @@
 import nibabel
 from nibabel.cmdline import parrec2nii
 
-from mock import Mock, MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 from nose.tools import assert_true
 from numpy.testing import (assert_almost_equal, assert_array_equal)
 

nibabel/tests/test_arrayproxy.py

@@ -23,7 +23,7 @@
 from ..openers import ImageOpener
 from ..nifti1 import Nifti1Header
 
-import mock
+from unittest import mock
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from nose.tools import (assert_true, assert_false, assert_equal,

nibabel/tests/test_openers.py

@@ -18,7 +18,7 @@
 from ..tmpdirs import InTemporaryDirectory
 from ..volumeutils import BinOpener
 
-import mock
+from unittest import mock
 from nose.tools import (assert_true, assert_false, assert_equal,
                         assert_not_equal, assert_raises)
 from ..testing import error_warnings

nibabel/tests/test_optpkg.py

@@ -1,7 +1,7 @@
 """ Testing optpkg module
 """
 
-import mock
+from unittest import mock
 import types
 import sys
 import builtins

setup.cfg

@@ -34,7 +34,6 @@ install_requires =
 tests_require =
     nose >=0.11
     pytest
-    mock
 test_suite = nose.collector
 zip_safe = False
 packages = find:
@@ -47,15 +46,13 @@ dev =
     twine
 doc =
     matplotlib >= 1.3.1
-    mock
     numpydoc
     sphinx >=0.3
     texext
 style =
     flake8
 test =
     coverage
-    mock
     nose >=0.11
     pytest
 all =