Tests: Use backported mock library on Python2

continuous_integration/appveyor/install.ps1

@@ -95,7 +95,7 @@ function UpdateConda ($python_home) {
 function main () {
     InstallMiniconda $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
     UpdateConda $env:PYTHON
-    InstallCondaPackages $env:PYTHON "conda-build==1.21.0 pytest pytest-cov pytest-qt"
+    InstallCondaPackages $env:PYTHON "conda-build==1.21.0 pytest pytest-cov pytest-qt mock"
 }
 
 

continuous_integration/travis/install.sh

@@ -56,7 +56,7 @@ install_conda()
         echo 'conda-build ==1.18.1' > $HOME/miniconda/conda-meta/pinned;
         conda install conda-build;
         conda create -q -n test-environment python=$PY_VERSION;
-        conda install -q -y -n test-environment pytest pytest-cov pytest-qt
+        conda install -q -y -n test-environment pytest pytest-cov pytest-qt mock
     fi
 }
 
@@ -70,7 +70,7 @@ install_pip()
     fi
 
     # Install testing packages
-    pip install pytest pytest-cov pytest-qt
+    pip install pytest pytest-cov pytest-qt mock
 
     # Install extra packages
     EXTRA_PACKAGES="matplotlib pandas sympy pyzmq pillow"

spyderlib/widgets/tests/test_editor.py

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