mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Fixed the --find-links option on Windows by unquoting the URL path seperators
This commit is contained in:
parent
62df4c2d4a
commit
8922a1ead4
21
pip.py
21
pip.py
|
@ -406,8 +406,7 @@ class InstallCommand(Command):
|
|||
dest='ignore_dependencies',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help='Ignore package dependencies',
|
||||
)
|
||||
help='Ignore package dependencies')
|
||||
self.parser.add_option(
|
||||
'--no-install',
|
||||
dest='no_install',
|
||||
|
@ -1115,11 +1114,12 @@ class PackageFinder(object):
|
|||
path = os.path.realpath(fn)
|
||||
for item in os.listdir(path):
|
||||
file_locations.append(
|
||||
filename_to_url(os.path.join(path, item)))
|
||||
filename_to_url2(os.path.join(path, item)))
|
||||
elif os.path.isfile(fn):
|
||||
file_locations.append(url)
|
||||
file_locations.append(filename_to_url2(fn))
|
||||
else:
|
||||
url_locations.append(url)
|
||||
|
||||
locations = [Link(url) for url in url_locations]
|
||||
logger.debug('URLs to search for versions for %s:' % req)
|
||||
for location in locations:
|
||||
|
@ -4043,6 +4043,19 @@ def filename_to_url(filename):
|
|||
url = url.lstrip('/')
|
||||
return 'file:///' + url
|
||||
|
||||
def filename_to_url2(filename):
|
||||
"""
|
||||
Convert a path to a file: URL. The path will be made absolute and have
|
||||
quoted path parts.
|
||||
"""
|
||||
filename = os.path.normcase(os.path.abspath(filename))
|
||||
drive, filename = os.path.splitdrive(filename)
|
||||
filepath = filename.split(os.path.sep)
|
||||
url = '/'.join([urllib.quote(part) for part in filepath])
|
||||
if not drive:
|
||||
url = url.lstrip('/')
|
||||
return 'file:///' + drive + url
|
||||
|
||||
def url_to_filename(url):
|
||||
"""
|
||||
Convert a file: URL to a path.
|
||||
|
|
Loading…
Reference in a new issue