diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 10:51:55 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 10:51:55 -0500 |
| commit | 29fa01621c3de0a5c78c4f49b5d051386d0d566f (patch) | |
| tree | fce7387c8ba82178be987b004cbda1c22005a04f /setuptools/tests/fixtures.py | |
| parent | 928324bd76f35e9c8c526df828577b5640a95ed0 (diff) | |
| parent | 6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 (diff) | |
| download | python-setuptools-git-29fa01621c3de0a5c78c4f49b5d051386d0d566f.tar.gz | |
Merge with master. Ref #229.
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/tests/fixtures.py')
| -rw-r--r-- | setuptools/tests/fixtures.py | 5 |
1 files changed, 4 insertions, 1 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 |