aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-30 14:30:55 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-01-30 14:30:55 -0500
commit90e95f2367a2325dbf29e5a7a92ef483806ae7b9 (patch)
treee400637aeaebcdb33b82885490c233447b59de6b /setuptools/tests
parentc0b93651405c1e79f3f49decfc97bc072641b2b7 (diff)
downloadexternal_python_setuptools-90e95f2367a2325dbf29e5a7a92ef483806ae7b9.tar.gz
external_python_setuptools-90e95f2367a2325dbf29e5a7a92ef483806ae7b9.tar.bz2
external_python_setuptools-90e95f2367a2325dbf29e5a7a92ef483806ae7b9.zip
Rely on backports.unittest_mock plugin to make mock available on old Python versions. Ref #949.
Diffstat (limited to 'setuptools/tests')
-rw-r--r--setuptools/tests/test_easy_install.py5
-rw-r--r--setuptools/tests/test_msvc.py5
2 files changed, 2 insertions, 8 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index f5c932da..b75e6ff2 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -14,15 +14,12 @@ import itertools
import distutils.errors
import io
import zipfile
+from unittest import mock
import time
from six.moves import urllib
import pytest
-try:
- from unittest import mock
-except ImportError:
- import mock
from setuptools import sandbox
from setuptools.sandbox import run_setup
diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
index a0c76ea0..fbeed1d5 100644
--- a/setuptools/tests/test_msvc.py
+++ b/setuptools/tests/test_msvc.py
@@ -5,12 +5,9 @@ Tests for msvc support module.
import os
import contextlib
import distutils.errors
+from unittest import mock
import pytest
-try:
- from unittest import mock
-except ImportError:
- import mock
from . import contexts