remove extra mock

binder/environment.yml

@@ -57,7 +57,6 @@ dependencies:
 - cython
 - flaky
 - matplotlib
-- mock
 - pandas
 - pillow
 - pytest <6.0

requirements/tests.txt

@@ -6,7 +6,6 @@ coverage
 cython
 flaky
 matplotlib
-mock
 pandas
 pillow
 pytest <6.0

setup.py

@@ -249,7 +249,6 @@ def run(self):
         'cython',
         'flaky',
         'matplotlib',
-        'mock',
         'pandas',
         'pillow',
         'pytest<6.0',

spyder/plugins/editor/tests/conftest.py

@@ -9,10 +9,7 @@
 """Fixtures for the Editor plugin tests."""
 
 import os.path as osp
-try:
-    from unittest.mock import MagicMock, Mock
-except ImportError:
-    from mock import MagicMock, Mock  # Python 2
+from unittest.mock import MagicMock, Mock
 
 # This is needed to avoid an error because QtAwesome
 # needs a QApplication to work correctly.

spyder/plugins/editor/tests/test_editor_config_dialog.py

@@ -6,10 +6,7 @@
 # ----------------------------------------------------------------------------
 """Tests for plugin config dialog."""
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Test library imports
 import pytest

spyder/plugins/editor/widgets/codeeditor.py

@@ -1489,10 +1489,7 @@ def request_hover(self, line, col, offset, show_hint=True, clicked=True):
     def handle_hover_response(self, contents):
         """Handle hover response."""
         if running_under_pytest():
-            try:
-                from unittest.mock import Mock
-            except ImportError:
-                from mock import Mock  # Python 2
+            from unittest.mock import Mock
 
             # On some tests this is returning a Mock
             if isinstance(contents, Mock):

spyder/plugins/editor/widgets/tests/conftest.py

@@ -10,10 +10,7 @@
 
 # Stdlib imports
 import os
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_bookmarks.py

@@ -9,10 +9,7 @@
 """
 
 # Stdlib imports
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_breakpoints.py

@@ -8,10 +8,7 @@
 Tests for breakpoints.
 """
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_codeeditor_1.py

@@ -10,10 +10,7 @@
 
 # Standard library imports
 import os.path as osp
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_editor.py

@@ -12,10 +12,7 @@
 import os
 import os.path as osp
 import sys
-try:
-    from unittest.mock import Mock, MagicMock
-except ImportError:
-    from mock import Mock, MagicMock  # Python 2
+from unittest.mock import Mock, MagicMock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_editorsplitter.py

@@ -9,12 +9,8 @@
 """
 
 # Standard library imports
-try:
-    from unittest.mock import Mock
-    import pathlib
-except ImportError:
-    from mock import Mock  # Python 2
-    import pathlib2 as pathlib
+from unittest.mock import Mock
+import pathlib
 
 import os
 import os.path as osp

spyder/plugins/editor/widgets/tests/test_save.py

@@ -10,10 +10,7 @@
 
 # Standard library imports
 import os.path as osp
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/editor/widgets/tests/test_shortcuts.py

@@ -11,10 +11,7 @@
 # Standard library imports
 import os
 import sys
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/help/tests/test_plugin.py

@@ -11,10 +11,7 @@
 """
 
 # Standard library imports
-try:
-    from unittest.mock import Mock, MagicMock
-except ImportError:
-    from mock import Mock, MagicMock  # Python 2
+from unittest.mock import Mock, MagicMock
 
 # Third party imports
 from qtpy import PYQT_VERSION

spyder/plugins/history/tests/test_history_config_dialog.py

@@ -6,10 +6,6 @@
 # ----------------------------------------------------------------------------
 """Tests for plugin config dialog."""
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
 
 # Test library imports
 import pytest

spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py

@@ -19,10 +19,7 @@
 import sys
 import tempfile
 from textwrap import dedent
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import IPython

spyder/plugins/profiler/tests/test_profiler.py

@@ -9,16 +9,9 @@
 """
 
 
-# Standard library imports
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
-
 # Third party imports
 from qtpy.QtGui import QIcon
 import pytest
-import mock
 
 # Local imports
 from spyder.plugins.profiler.widgets.main_widget import ProfilerDataTree

spyder/plugins/projects/widgets/tests/test_projectdialog.py

@@ -10,10 +10,7 @@
 
 # Standard library imports
 import os
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import pytest

spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py

@@ -13,10 +13,7 @@
 # Standard library imports
 import os
 import sys
-try:
-    from unittest.mock import Mock, ANY
-except ImportError:
-    from mock import Mock, ANY  # Python 2
+from unittest.mock import Mock, ANY
 
 # Third party imports
 import numpy as np

spyder/plugins/variableexplorer/widgets/tests/test_dataframeeditor.py

@@ -16,10 +16,7 @@
 import os
 import sys
 from datetime import datetime
-try:
-    from unittest.mock import Mock, ANY
-except ImportError:
-    from mock import Mock, ANY  # Python 2
+from unittest.mock import Mock, ANY
 
 # Third party imports
 from pandas import (DataFrame, date_range, read_csv, concat, Index, RangeIndex,

spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py

@@ -12,10 +12,7 @@
 # Standard library imports
 import string
 import sys
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 from flaky import flaky

spyder/widgets/tests/test_collectioneditor.py

@@ -16,10 +16,7 @@
 import copy
 import datetime
 from xml.dom.minidom import parseString
-try:
-    from unittest.mock import Mock
-except ImportError:
-    from mock import Mock  # Python 2
+from unittest.mock import Mock
 
 # Third party imports
 import numpy