-
Notifications
You must be signed in to change notification settings - Fork 375
Fix TypeError in issue #158/#159 #160
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.
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
Open
wcooley
wants to merge
2
commits into
mahmoud:master
Choose a base branch
from
wcooley:bugfix/issue158-urlutils-chained-navigate-fix1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -268,6 +268,23 @@ def test_rel_navigate(): | |
| return | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| ('expected', 'base', 'a', 'b'), [ | ||
| ('https://host/b', 'https://host', 'a', '/b'), | ||
| ('https://host/a/b', 'https://host', 'a', 'b'), | ||
| ('https://host/a/b', 'https://host', 'a/', 'b'), | ||
| ('https://host/a/b', 'https://host', '/a', 'b'), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using the expected result should be |
||
| ('https://host/a/b', 'https://host/a/', None, 'b'), | ||
| ('https://host/a/b', 'https://host/a', None, 'b'), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using the expected result should be |
||
| ]) | ||
| def test_chained_navigate(expected, base, a, b): | ||
| """Chained :meth:`navigate` calls produces correct results.""" | ||
| if a is not None: | ||
| assert expected == URL(base).navigate(a).navigate(b).to_text() | ||
| else: | ||
| assert expected == URL(base).navigate(b).to_text() | ||
|
|
||
|
|
||
| def test_navigate(): | ||
| orig_text = u'http://a.b/c/d?e#f' | ||
| orig = URL(orig_text) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
the expected result should be
https://host/bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't looked at this in a long time, so pardon me if I'm completely backwards and no longer clear on what I thought behavior should be.
When you say, "the expected result should be", where are you basing that "should be" on? The scant documentation says, "Useful for navigating those relative links with ease." I consider this analogous to using
cdon a Unix system; all references are relative unless the destination starts with/.Actually, the vexing nature of the way things work now is more apparent if you have multiple path segments:
What I find most surprising is that, without a trailing slash on the base,
navigatewith a non-fragment argument assumes the last part of the path is (erm, not sure about the right terminology) a "leaf" instead of a "stem" (or "file" instead of a "directory"?).To make a relative link from an URL without a trialing slash with the behavior you're describing, you have to: 1.
to_text()2. conditionally append a '/' (normalize()will not make//->/) 3. recreate URL. Because theURLobject is immutable, it's much easier to change the string argument to enable "upwards" navigation by pre-pending '../'. This is what I would find less surprising:Unfortunately, I think this ship has sailed; changing this behavior would be massively backwards-incompatible.