From b639cf0fa905f6fda3879c991197b759aaa20091 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 4 Jan 2016 20:34:46 -0500 Subject: Use six in pkg_resources. --HG-- branch : feature/issue-229 --- pkg_resources/tests/test_resources.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkg_resources/tests') 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 -- cgit v1.2.3