diff options
| author | Marc Abramowitz <marc@marc-abramowitz.com> | 2014-10-11 15:42:24 -0700 |
|---|---|---|
| committer | Marc Abramowitz <marc@marc-abramowitz.com> | 2014-10-11 15:42:24 -0700 |
| commit | c4bc8b21d203668645ab551318aef5859e3acb9e (patch) | |
| tree | ac8f776e6a57d2a2edba2290f6cc3e2472ff90fa /pkg_resources.py | |
| parent | f110f30df540d21c4fe7870460c07d70c6c8cd0b (diff) | |
| download | python-setuptools-git-c4bc8b21d203668645ab551318aef5859e3acb9e.tar.gz | |
Fix VersionConflict test failure
Fixes `TypeError: 'NoneType' object is not iterable` error at pkg_resources.py:632
Fixes issue #270
--HG--
branch : BB-270_fix_VersionConflict_test_failure_2
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index de50c4b0..511068a6 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -628,7 +628,7 @@ class WorkingSet(object): if dist not in req: # Oops, the "best" so far conflicts with a dependency tmpl = "%s is installed but %s is required by %s" - args = dist, req, list(required_by.get(req)) + args = dist, req, list(required_by.get(req, [])) raise VersionConflict(tmpl % args) # push the new requirements onto the stack |