diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 20:34:46 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 20:34:46 -0500 |
| commit | b639cf0fa905f6fda3879c991197b759aaa20091 (patch) | |
| tree | cbdabfa6a170816d79ef5870b34ad33ed4222377 /pkg_resources/tests | |
| parent | a2484bd0b21ddd984823067dc2c4fbcdf0bc70e6 (diff) | |
| download | python-setuptools-git-b639cf0fa905f6fda3879c991197b759aaa20091.tar.gz | |
Use six in pkg_resources.
--HG--
branch : feature/issue-229
Diffstat (limited to 'pkg_resources/tests')
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index 141d63ad..4241765a 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -244,9 +244,8 @@ class TestWorkingSet: with pytest.raises(VersionConflict) as vc: ws.resolve(parse_requirements("Foo\nBar\n")) - msg = "Baz 1.0 is installed but Baz==2.0 is required by {'Bar'}" - if pkg_resources.PY2: - msg = msg.replace("{'Bar'}", "set(['Bar'])") + msg = "Baz 1.0 is installed but Baz==2.0 is required by " + msg += repr(set(['Bar'])) assert vc.value.report() == msg |