diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-09-16 11:43:58 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-09-16 11:43:58 (GMT) |
| commit | f676748a052cacdf9963aa840bfa6107275d163e (patch) | |
| tree | d3e9b677f728ad378a8d16c8f8155af461ac543a /Lib/urllib | |
| parent | 2dc77f0e197b9ca9710d7ae20ff13fe2bea541c4 (diff) | |
| download | cpython-f676748a052cacdf9963aa840bfa6107275d163e.zip cpython-f676748a052cacdf9963aa840bfa6107275d163e.tar.gz cpython-f676748a052cacdf9963aa840bfa6107275d163e.tar.bz2 | |
Issue #25895: Enable WebSocket URL schemes in urllib.parse.urljoin
Patch by Gergely Imreh and Markus Holtermann.
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/parse.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 4d7fcec..566fbf7 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'] |