ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 04:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg_resources: better error message on bad spec

Browse Source 
Include the text of the offending distribution spec when it is ill-formed.

I got an error message from pkg_resources.py saying that a distribution spec
was ill-formed, because it ended with an '=' and nothing came after the '='.
However, the error message and stack trace didn't tell which distribution spec
it was.

With this patch, it includes the distribution spec itself in the error message.

There is no unit test of this patch, but I did test it manually by inserting a
"raise ValueError('WHATEVER')" into the code and re-running it and observing
that the new output correctly included the distribution
This commit is contained in:
Zooko O'Whielacronx 2012-11-22 09:27:28 -07:00 committed by David-Sarah Hopwood
parent d5c8580d8e
commit 06a8b1ea84
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setuptools-0.6c16dev3.egg/pkg_resources.py
View File

@ -528,11 +528,14 @@ class WorkingSet(object):
# dist is unsatisfactory, in which case we won't add it.
if __requires__ is not None:
for thisreqstr in __requires__:
for thisreq in parse_requirements(thisreqstr):
if thisreq.key == dist.key:
if dist not in thisreq:
return
try:
for thisreq in parse_requirements(thisreqstr):
if thisreq.key == dist.key:
if dist not in thisreq:
return
except ValueError, e:
e.args = tuple(e.args + ({'thisreqstr': thisreqstr},))
raise
self.by_key[dist.key] = dist
if dist.key not in keys: