mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Removed unused comes_from argument of parse_requirements
This commit is contained in:
parent
0512785fbe
commit
3defc24e31
2 changed files with 4 additions and 20 deletions
|
@ -105,7 +105,6 @@ class ParsedLine(object):
|
||||||
self,
|
self,
|
||||||
filename, # type: str
|
filename, # type: str
|
||||||
lineno, # type: int
|
lineno, # type: int
|
||||||
comes_from, # type: Optional[str]
|
|
||||||
args, # type: str
|
args, # type: str
|
||||||
opts, # type: Values
|
opts, # type: Values
|
||||||
constraint, # type: bool
|
constraint, # type: bool
|
||||||
|
@ -113,7 +112,6 @@ class ParsedLine(object):
|
||||||
# type: (...) -> None
|
# type: (...) -> None
|
||||||
self.filename = filename
|
self.filename = filename
|
||||||
self.lineno = lineno
|
self.lineno = lineno
|
||||||
self.comes_from = comes_from
|
|
||||||
self.opts = opts
|
self.opts = opts
|
||||||
self.constraint = constraint
|
self.constraint = constraint
|
||||||
|
|
||||||
|
@ -134,7 +132,6 @@ def parse_requirements(
|
||||||
filename, # type: str
|
filename, # type: str
|
||||||
session, # type: PipSession
|
session, # type: PipSession
|
||||||
finder=None, # type: Optional[PackageFinder]
|
finder=None, # type: Optional[PackageFinder]
|
||||||
comes_from=None, # type: Optional[str]
|
|
||||||
options=None, # type: Optional[optparse.Values]
|
options=None, # type: Optional[optparse.Values]
|
||||||
constraint=False, # type: bool
|
constraint=False, # type: bool
|
||||||
):
|
):
|
||||||
|
@ -144,13 +141,12 @@ def parse_requirements(
|
||||||
:param filename: Path or url of requirements file.
|
:param filename: Path or url of requirements file.
|
||||||
:param session: PipSession instance.
|
:param session: PipSession instance.
|
||||||
:param finder: Instance of pip.index.PackageFinder.
|
:param finder: Instance of pip.index.PackageFinder.
|
||||||
:param comes_from: Origin description of requirements.
|
|
||||||
:param options: cli options.
|
:param options: cli options.
|
||||||
:param constraint: If true, parsing a constraint file rather than
|
:param constraint: If true, parsing a constraint file rather than
|
||||||
requirements file.
|
requirements file.
|
||||||
"""
|
"""
|
||||||
line_parser = get_line_parser(finder)
|
line_parser = get_line_parser(finder)
|
||||||
parser = RequirementsFileParser(session, line_parser, comes_from)
|
parser = RequirementsFileParser(session, line_parser)
|
||||||
|
|
||||||
for parsed_line in parser.parse(filename, constraint):
|
for parsed_line in parser.parse(filename, constraint):
|
||||||
parsed_req = handle_line(
|
parsed_req = handle_line(
|
||||||
|
@ -333,12 +329,10 @@ class RequirementsFileParser(object):
|
||||||
self,
|
self,
|
||||||
session, # type: PipSession
|
session, # type: PipSession
|
||||||
line_parser, # type: LineParser
|
line_parser, # type: LineParser
|
||||||
comes_from, # type: Optional[str]
|
|
||||||
):
|
):
|
||||||
# type: (...) -> None
|
# type: (...) -> None
|
||||||
self._session = session
|
self._session = session
|
||||||
self._line_parser = line_parser
|
self._line_parser = line_parser
|
||||||
self._comes_from = comes_from
|
|
||||||
|
|
||||||
def parse(self, filename, constraint):
|
def parse(self, filename, constraint):
|
||||||
# type: (str, bool) -> Iterator[ParsedLine]
|
# type: (str, bool) -> Iterator[ParsedLine]
|
||||||
|
@ -382,9 +376,7 @@ class RequirementsFileParser(object):
|
||||||
|
|
||||||
def _parse_file(self, filename, constraint):
|
def _parse_file(self, filename, constraint):
|
||||||
# type: (str, bool) -> Iterator[ParsedLine]
|
# type: (str, bool) -> Iterator[ParsedLine]
|
||||||
_, content = get_file_content(
|
_, content = get_file_content(filename, self._session)
|
||||||
filename, self._session, comes_from=self._comes_from
|
|
||||||
)
|
|
||||||
|
|
||||||
lines_enum = preprocess(content)
|
lines_enum = preprocess(content)
|
||||||
|
|
||||||
|
@ -399,7 +391,6 @@ class RequirementsFileParser(object):
|
||||||
yield ParsedLine(
|
yield ParsedLine(
|
||||||
filename,
|
filename,
|
||||||
line_number,
|
line_number,
|
||||||
self._comes_from,
|
|
||||||
args_str,
|
args_str,
|
||||||
opts,
|
opts,
|
||||||
constraint,
|
constraint,
|
||||||
|
@ -553,15 +544,14 @@ def expand_env_variables(lines_enum):
|
||||||
yield line_number, line
|
yield line_number, line
|
||||||
|
|
||||||
|
|
||||||
def get_file_content(url, session, comes_from=None):
|
def get_file_content(url, session):
|
||||||
# type: (str, PipSession, Optional[str]) -> Tuple[str, Text]
|
# type: (str, PipSession) -> Tuple[str, Text]
|
||||||
"""Gets the content of a file; it may be a filename, file: URL, or
|
"""Gets the content of a file; it may be a filename, file: URL, or
|
||||||
http: URL. Returns (location, content). Content is unicode.
|
http: URL. Returns (location, content). Content is unicode.
|
||||||
Respects # -*- coding: declarations on the retrieved files.
|
Respects # -*- coding: declarations on the retrieved files.
|
||||||
|
|
||||||
:param url: File path or url.
|
:param url: File path or url.
|
||||||
:param session: PipSession instance.
|
:param session: PipSession instance.
|
||||||
:param comes_from: Origin description of requirements.
|
|
||||||
"""
|
"""
|
||||||
scheme = get_url_scheme(url)
|
scheme = get_url_scheme(url)
|
||||||
|
|
||||||
|
@ -572,11 +562,6 @@ def get_file_content(url, session, comes_from=None):
|
||||||
return resp.url, resp.text
|
return resp.url, resp.text
|
||||||
|
|
||||||
elif scheme == 'file':
|
elif scheme == 'file':
|
||||||
if comes_from and comes_from.startswith('http'):
|
|
||||||
raise InstallationError(
|
|
||||||
'Requirements file {} references URL {}, '
|
|
||||||
'which is local'.format(comes_from, url)
|
|
||||||
)
|
|
||||||
url = url_to_path(url)
|
url = url_to_path(url)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -47,7 +47,6 @@ def get_processed_req_from_line(line, fname='file', lineno=1):
|
||||||
parsed_line = ParsedLine(
|
parsed_line = ParsedLine(
|
||||||
fname,
|
fname,
|
||||||
lineno,
|
lineno,
|
||||||
fname,
|
|
||||||
args_str,
|
args_str,
|
||||||
opts,
|
opts,
|
||||||
False,
|
False,
|
||||||
|
|
Loading…
Reference in a new issue