summaryrefslogtreecommitdiff
path: root/pkg_resources/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'pkg_resources/__init__.py')
-rw-r--r--pkg_resources/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 277da3f9..522247e0 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -342,7 +342,7 @@ class VersionConflict(ResolutionError):
class ContextualVersionConflict(VersionConflict):
"""
- A VersionConflict that accepts a third parameter, the list of the
+ A VersionConflict that accepts a third parameter, the set of the
requirements that required the installed Distribution.
"""
@@ -796,7 +796,7 @@ class WorkingSet(object):
to_activate.append(dist)
if dist not in req:
# Oops, the "best" so far conflicts with a dependency
- dependent_req = list(required_by.get(req, []))
+ dependent_req = required_by[req]
raise ContextualVersionConflict(dist, req, dependent_req)
# push the new requirements onto the stack