diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-04 12:44:16 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-04 12:44:16 -0500 |
| commit | 06b95e98f06916ccbd04b60e9d3866e3d6bf7ae2 (patch) | |
| tree | 94b94d6f0e63314847d38ce6aea7dc910da5af8e /pkg_resources/__init__.py | |
| parent | d8de6c98d879adbe5b8df731a5b61c06a48b9a2f (diff) | |
| download | python-setuptools-git-06b95e98f06916ccbd04b60e9d3866e3d6bf7ae2.tar.gz | |
Remove unreachable branch
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 41d3eb38..bcee9d28 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -627,8 +627,7 @@ class WorkingSet(object): if dist is not None and dist not in req: # XXX add more info raise VersionConflict(dist, req) - else: - return dist + return dist def iter_entry_points(self, group, name=None): """Yield entry point objects from `group` matching `name` |