* refactoring

tests/test_napoleon.py

@@ -10,16 +10,13 @@
     :license: BSD, see LICENSE for details.
 """
 
-try:
-    # Python >=3.3
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock
 from collections import namedtuple
+from unittest import TestCase
+
 from sphinx.application import Sphinx
 from sphinx.ext.napoleon import (_process_docstring, _skip_member, Config,
                                  setup)
-from unittest import TestCase
+from util import mock
 
 
 def _private_doc():
@@ -80,10 +77,10 @@ class ProcessDocstringTest(TestCase):
                  '',
                  'Args:',
                  '   arg1: arg1 description']
-        app = Mock()
+        app = mock.Mock()
         app.config = Config()
-        _process_docstring(app, 'class', 'SampleClass', SampleClass, Mock(),
-                           lines)
+        _process_docstring(app, 'class', 'SampleClass', SampleClass,
+                           mock.Mock(), lines)
 
         expected = ['Summary line.',
                     '',
@@ -97,7 +94,7 @@ class SetupTest(TestCase):
         setup(object())
 
     def test_add_config_values(self):
-        app = Mock(Sphinx)
+        app = mock.Mock(Sphinx)
         setup(app)
         for name, (default, rebuild) in Config._config_values.items():
             has_config = False
@@ -127,18 +124,18 @@ class SetupTest(TestCase):
 class SkipMemberTest(TestCase):
     def assertSkip(self, what, member, obj, expect_skip, config_name):
         skip = 'default skip'
-        app = Mock()
+        app = mock.Mock()
         app.config = Config()
         setattr(app.config, config_name, True)
         if expect_skip:
             self.assertEqual(skip, _skip_member(app, what, member, obj, skip,
-                                                Mock()))
+                                                mock.Mock()))
         else:
             self.assertFalse(_skip_member(app, what, member, obj, skip,
-                                          Mock()))
+                                          mock.Mock()))
         setattr(app.config, config_name, False)
         self.assertEqual(skip, _skip_member(app, what, member, obj, skip,
-                                            Mock()))
+                                            mock.Mock()))
 
     def test_namedtuple(self):
         self.assertSkip('class', '_asdict',

tests/test_napoleon_docstring.py

@@ -11,15 +11,11 @@
 """
 
 import textwrap
-from sphinx.ext.napoleon import Config
-from sphinx.ext.napoleon.docstring import GoogleDocstring, NumpyDocstring
 from unittest import TestCase
 
-try:
-    # Python >=3.3
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock
+from sphinx.ext.napoleon import Config
+from sphinx.ext.napoleon.docstring import GoogleDocstring, NumpyDocstring
+from util import mock
 
 
 class BaseDocstringTest(TestCase):
@@ -430,7 +426,7 @@ otherfunc : relationship
 """
 
         config = Config()
-        app = Mock()
+        app = mock.Mock()
         actual = str(NumpyDocstring(docstring, config, app, "method"))
 
         expected = """\