Bug #1407902: Added support for sftp:// URIs to urlparse.

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 8f55b3fcb36de2ad7cac73b91f8c58ac1559a21c..48a4e1265929bc4ade01f46a71a14eabb0838f43 100644 (file)
--- 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 8382e86c58229aa0a4d6202b6c189c5abef03572..5ef3b422262dd3bf2b26b2acc09b308a62b03d09 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,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