From e16d64d53ce54c5c3f3115c9520957fb1724eb60 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 16 Jan 2016 17:38:00 -0500 Subject: Get VersionConflict from pkg_resources. --- setuptools/tests/test_easy_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- cgit v1.2.1