[3.3] bpo-30500: urllib: Simplify splithost by calling into urlparse. (#1849) #2292
Conversation
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
|
@Haypo, thanks for your PR! By analyzing the history of the files in this pull request, we identified @gvanrossum, @ezio-melotti and @ncoghlan to be potential reviewers. |
vstinner
commented
Jun 20, 2017
| @@ -860,8 +860,7 @@ def splithost(url): | |||
| """splithost('//host[:port]/path') --> 'host[:port]', '/path'.""" | |||
| global _hostprog | |||
| if _hostprog is None: | |||
| import re | |||
| _hostprog = re.compile('^//([^/?]*)(.*)$') | |||
| _hostprog = re.compile('//([^/#?]*)(.*)', re.DOTALL) | |||
There was a problem hiding this comment.
I'm not sure sure of the addition of DOTALL, see:
http://bugs.python.org/issue30500#msg296422
There was a problem hiding this comment.
The same change was done in the master branch, so it's fine.
|
I backported the commit master: I had to remove subTest() from test_urlparse.py, since this feature was added to Python 3.4. |
|
@ned-deily: Would you mind to review this change? I tested manually that "./python -m test test_urlparse" pass. Sadly, 3.3 is no pre-commit CI yet :-( |
Keep test_main() and remove subTest() (introduced in Python 3.4).
… (#2291) The current regex based splitting produces a wrong result. For example:: http://abc#@def Web browsers parse that URL as ``http://abc/#@def``, that is, the host is ``abc``, the path is ``/``, and the fragment is ``#@def``. (cherry picked from commit 90e01e5) (cherry picked from commit cc54c1c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The current regex based splitting produces a wrong result. For example::
http://abc#@def
Web browsers parse that URL as
http://abc/#@def, that is, the hostis
abc, the path is/, and the fragment is#@def.(cherry picked from commit 90e01e5)
https://bugs.python.org/issue30500