diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 17:38:00 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 17:38:00 -0500 |
commit | 670a9c895e6180e72a069f5208f0ed2ae38b9728 (patch) | |
tree | 10fe37bbfe3c4c5ed74b26082a4b114dbf2d33c1 | |
parent | d716b3c03b111512133126a5f42c7553bfb43174 (diff) | |
download | external_python_setuptools-670a9c895e6180e72a069f5208f0ed2ae38b9728.tar.gz external_python_setuptools-670a9c895e6180e72a069f5208f0ed2ae38b9728.tar.bz2 external_python_setuptools-670a9c895e6180e72a069f5208f0ed2ae38b9728.zip |
Get VersionConflict from pkg_resources.19.4
-rw-r--r-- | setuptools/tests/test_easy_install.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 895ce7aa..99ac7317 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -396,7 +396,7 @@ class TestSetupRequires: # Don't even need to install the package, just # running the setup.py at all is sufficient run_setup(test_setup_py, ['--name']) - except VersionConflict: + except pkg_resources.VersionConflict: self.fail('Installing setup.py requirements ' 'caused a VersionConflict') |