McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Merge pull request #8830 from uranusjr/env-var-req-file

Browse source 
Replace custom URL parsing with url_to_path()
This commit is contained in:
Pradyun Gedam 2020-09-08 18:46:33 +05:30 committed by GitHub
commit 8663855711
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pip/_internal/req/req_file.py
View file

@ -21,7 +21,7 @@ from pip._internal.models.search_scope import SearchScope
from pip._internal.network.utils import raise_for_status from pip._internal.network.utils import raise_for_status
from pip._internal.utils.encoding import auto_decode from pip._internal.utils.encoding import auto_decode
from pip._internal.utils.typing import MYPY_CHECK_RUNNING from pip._internal.utils.typing import MYPY_CHECK_RUNNING
from pip._internal.utils.urls import get_url_scheme from pip._internal.utils.urls import get_url_scheme, url_to_path
if MYPY_CHECK_RUNNING: if MYPY_CHECK_RUNNING:
from optparse import Values from optparse import Values
@ -572,16 +572,7 @@ def get_file_content(url, session, comes_from=None):
'Requirements file {} references URL {}, ' 'Requirements file {} references URL {}, '
'which is local'.format(comes_from, url) 'which is local'.format(comes_from, url)
) )
url = url_to_path(url)
path = url.split(':', 1)[1]
path = path.replace('\\', '/')
match = _url_slash_drive_re.match(path)
if match:
path = match.group(1) + ':' + path.split('|', 1)[1]
path = urllib_parse.unquote(path)
if path.startswith('/'):
path = '/' + path.lstrip('/')
url = path
try: try:
with open(url, 'rb') as f: with open(url, 'rb') as f:
@ -591,6 +582,3 @@ def get_file_content(url, session, comes_from=None):
'Could not open requirements file: {}'.format(exc) 'Could not open requirements file: {}'.format(exc)
) )
return url, content return url, content
_url_slash_drive_re = re.compile(r'/*([a-z])\|', re.I)