aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_msvc9compiler.py
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2015-01-15 23:25:04 +0100
committerArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2015-01-15 23:25:04 +0100
commitcde1eb84bd1813ff4425fe6f05cbdeba8e410c13 (patch)
treec5d0db0cf20a916f3c065a3832a813a545c7e1af /setuptools/tests/test_msvc9compiler.py
parent72d5cc0b9ea095437bf2796298dd3658624c081e (diff)
downloadexternal_python_setuptools-cde1eb84bd1813ff4425fe6f05cbdeba8e410c13.tar.gz
external_python_setuptools-cde1eb84bd1813ff4425fe6f05cbdeba8e410c13.tar.bz2
external_python_setuptools-cde1eb84bd1813ff4425fe6f05cbdeba8e410c13.zip
Use unittest.mock from standard library instead of external mock with Python >=3.3.
Diffstat (limited to 'setuptools/tests/test_msvc9compiler.py')
-rw-r--r--setuptools/tests/test_msvc9compiler.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/tests/test_msvc9compiler.py b/setuptools/tests/test_msvc9compiler.py
index a0820fff..e54e7a6e 100644
--- a/setuptools/tests/test_msvc9compiler.py
+++ b/setuptools/tests/test_msvc9compiler.py
@@ -7,7 +7,10 @@ import contextlib
import distutils.errors
import pytest
-import mock
+try:
+ from unittest import mock
+except ImportError:
+ import mock
from . import contexts