summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/urlparse.py22
-rw-r--r--Misc/NEWS2
2 files changed, 13 insertions, 11 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index c7c77e387f..8b750519de 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -9,22 +9,22 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
# A classification of schemes ('' means apply by default)
uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap',
- 'wais', 'file', 'https', 'shttp', 'mms',
- 'prospero', 'rtsp', 'rtspu', '']
+ 'wais', 'file', 'https', 'shttp', 'mms',
+ 'prospero', 'rtsp', 'rtspu', '', 'sftp']
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
- 'imap', 'wais', 'file', 'mms', 'https', 'shttp',
- 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
- 'svn', 'svn+ssh']
+ 'imap', 'wais', 'file', 'mms', 'https', 'shttp',
+ 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
+ 'svn', 'svn+ssh', 'sftp']
non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
- 'telnet', 'wais', 'imap', 'snews', 'sip']
+ 'telnet', 'wais', 'imap', 'snews', 'sip']
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
- 'https', 'shttp', 'rtsp', 'rtspu', 'sip',
- 'mms', '']
+ 'https', 'shttp', 'rtsp', 'rtspu', 'sip',
+ 'mms', '', 'sftp']
uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms',
- 'gopher', 'rtsp', 'rtspu', 'sip', '']
+ 'gopher', 'rtsp', 'rtspu', 'sip', '']
uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news',
- 'nntp', 'wais', 'https', 'shttp', 'snews',
- 'file', 'prospero', '']
+ 'nntp', 'wais', 'https', 'shttp', 'snews',
+ 'file', 'prospero', '']
# Characters valid in scheme names
scheme_chars = ('abcdefghijklmnopqrstuvwxyz'
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e0f7330a7..ca5c5d9d0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -337,6 +337,8 @@ Extension Modules
Library
-------
+- Bug #1407902: Added support for sftp:// URIs to urlparse.
+
- Bug #1371247: Update Windows locale identifiers in locale.py.
- Bug #1394565: SimpleHTTPServer now doesn't choke on query parameters