diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> | 2015-01-15 23:25:04 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> | 2015-01-15 23:25:04 +0100 |
| commit | cde1eb84bd1813ff4425fe6f05cbdeba8e410c13 (patch) | |
| tree | c5d0db0cf20a916f3c065a3832a813a545c7e1af /setuptools/tests | |
| parent | 72d5cc0b9ea095437bf2796298dd3658624c081e (diff) | |
| download | external_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')
| -rw-r--r-- | setuptools/tests/fixtures.py | 5 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 5 | ||||
| -rw-r--r-- | setuptools/tests/test_msvc9compiler.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py index 0b1eaf5f..c70c38cb 100644 --- a/setuptools/tests/fixtures.py +++ b/setuptools/tests/fixtures.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import pytest from . import contexts diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 72b040e1..689860c3 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -15,7 +15,10 @@ import logging import itertools import pytest -import mock +try: + from unittest import mock +except ImportError: + import mock from setuptools import sandbox from setuptools import compat 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 |