summaryrefslogtreecommitdiff
path: root/pkg_resources/tests/test_markers.py
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 /pkg_resources/tests/test_markers.py
parentc0b93651405c1e79f3f49decfc97bc072641b2b7 (diff)
downloadpython-setuptools-git-90e95f2367a2325dbf29e5a7a92ef483806ae7b9.tar.gz
Rely on backports.unittest_mock plugin to make mock available on old Python versions. Ref #949.
Diffstat (limited to 'pkg_resources/tests/test_markers.py')
-rw-r--r--pkg_resources/tests/test_markers.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py
index 78810b6e..9306d5b3 100644
--- a/pkg_resources/tests/test_markers.py
+++ b/pkg_resources/tests/test_markers.py
@@ -1,7 +1,4 @@
-try:
- import unittest.mock as mock
-except ImportError:
- import mock
+from unittest import mock
from pkg_resources import evaluate_marker