diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-09-16 11:45:15 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-09-16 11:45:15 (GMT) |
| commit | f8479eeb34de987a5683af9a0c446dc35b4fd534 (patch) | |
| tree | 0940fd6b20ab8dfda34104ab5636267ccfcd756d | |
| parent | 355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (diff) | |
| parent | f676748a052cacdf9963aa840bfa6107275d163e (diff) | |
| download | cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.zip cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.gz cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.bz2 | |
Issue #25895: Merge from 3.5
| -rw-r--r-- | Doc/library/urllib.parse.rst | 2 | ||||
| -rw-r--r-- | Lib/test/test_urlparse.py | 2 | ||||
| -rw-r--r-- | Lib/urllib/parse.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index d79d8f0..a66b1c3 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -25,7 +25,7 @@ Resource Locators. It supports the following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``, ``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``, ``shttp``, ``sip``, ``sips``, ``snews``, ``svn``, ``svn+ssh``, ``telnet``, -``wais``. +``wais``, ``ws``, ``wss``. The :mod:`urllib.parse` module defines functions that fall into two broad categories: URL parsing and URL quoting. These are covered in detail in diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 9165d73..99c5c03 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -425,6 +425,8 @@ class UrlParseTestCase(unittest.TestCase): self.checkJoin('', 'http://a/./g', 'http://a/./g') self.checkJoin('svn://pathtorepo/dir1', 'dir2', 'svn://pathtorepo/dir2') self.checkJoin('svn+ssh://pathtorepo/dir1', 'dir2', 'svn+ssh://pathtorepo/dir2') + self.checkJoin('ws://a/b','g','ws://a/g') + self.checkJoin('wss://a/b','g','wss://a/g') # XXX: The following tests are no longer compatible with RFC3986 # self.checkJoin(SIMPLE_BASE, '../../../g','http://a/../g') diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 99a6977..958767a 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -42,11 +42,12 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag", uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file', 'https', 'shttp', 'mms', 'prospero', 'rtsp', 'rtspu', '', 'sftp', - 'svn', 'svn+ssh'] + 'svn', 'svn+ssh', 'ws', 'wss'] uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', - 'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh'] + 'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh', + 'ws', 'wss'] uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', 'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips', 'mms', '', 'sftp', 'tel'] @@ -27,6 +27,9 @@ Core and Builtins Library ------- +- Issue #25895: Enable WebSocket URL schemes in urllib.parse.urljoin. + Patch by Gergely Imreh and Markus Holtermann. + - Issue #28114: Fix a crash in parse_envlist() when env contains byte strings. Patch by Eryk Sun. |