McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Clean up source location message creation.

This commit is contained in:
Chris Hunt 2019-09-15 20:47:11 -04:00
parent c3e6329039
commit ec8bf2cc22
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pip/_internal/req/constructors.py
View File

@ -336,6 +336,12 @@ def install_req_from_line(
extras = Requirement("placeholder" + extras_as_string.lower()).extras
else:
extras = ()
def with_source(text):
if not line_source:
return text
return '{} (from {})'.format(text, line_source)
if req_as_string is not None:
try:
req = Requirement(req_as_string)
@ -348,12 +354,8 @@ def install_req_from_line(
add_msg = "= is not a valid operator. Did you mean == ?"
else:
add_msg = ''
if line_source is None:
source = ''
else:
source = ' (from {})'.format(line_source)
msg = (
'Invalid requirement: {!r}{}'.format(req_as_string, source)
msg = with_source(
'Invalid requirement: {!r}'.format(req_as_string)
)
if add_msg:
msg += '\nHint: {}'.format(add_msg)