Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize paths starting with ~ in find-links #2455

Merged
merged 3 commits into from
Mar 7, 2015
Merged

Normalize paths starting with ~ in find-links #2455

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2102cdb
Normalize paths starting with ~ in find-links
pfmoore Feb 24, 2015
2c7bc73
pip/index.py: Add import of normalize_path
msabramo Mar 7, 2015
eaac580
Merge pull request #1 from msabramo/pr2455_tweak_1
pfmoore Mar 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions pip/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from pip._vendor.six.moves.urllib import request as urllib_request

from pip.compat import ipaddress
from pip.utils import Inf, cached_property, normalize_name, splitext
from pip.utils import (
Inf, cached_property, normalize_name, splitext, normalize_path)
from pip.utils.deprecation import RemovedInPip7Warning, RemovedInPip8Warning
from pip.utils.logging import indent_log
from pip.exceptions import (
Expand Down Expand Up @@ -66,7 +67,19 @@ def __init__(self, find_links, index_urls,
"'session'"
)

self.find_links = find_links
# Build find_links. If an argument starts with ~, it may be
# a local file relative to a home directory. So try normalizing
# it and if it exists, use the normalized version.
# This is deliberately conservative - it might be fine just to
# blindly normalize anything starting with a ~...
self.find_links = []
for link in find_links:
if link.startswith('~'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should maybe also accept "file://~/som_path" ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My instinct says no, ~/foo is a path and should be subject to typical path expansions. But file://~/foo is a URL, and ~-expansion isn't part of the URL spec.

new_link = normalize_path(link)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot to import normalize_path. See pfmoore#1

if os.path.exists(new_link):
link = new_link
self.find_links.append(link)

self.index_urls = index_urls
self.dependency_links = []

Expand Down