Merged revisions 81130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81130 | senthil.kumaran | 2010-05-13 08:55:21 +0530 (Thu, 13 May 2010) | 3 lines
Fix Issue8657 - adding git and git+ssh as know schemes.
........
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 0e73e4b..c5135c1 100644
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -5,21 +5,22 @@
RFC 3986 (STD66): "Uniform Resource Identifiers" by T. Berners-Lee, R. Fielding
and L. Masinter, January 2005.
-RFC2396: "Uniform Resource Identifiers (URI)": Generic Syntax by T.
+RFC 2396: "Uniform Resource Identifiers (URI)": Generic Syntax by T.
Berners-Lee, R. Fielding, and L. Masinter, August 1998.
-RFC2368: "The mailto URL scheme", by P.Hoffman , L Masinter, J. Zwinski, July 1998.
+RFC 2368: "The mailto URL scheme", by P.Hoffman , L Masinter, J. Zwinski, July 1998.
RFC 1808: "Relative Uniform Resource Locators", by R. Fielding, UC Irvine, June
1995.
-RFC1738: "Uniform Resource Locators (URL)" by T. Berners-Lee, L. Masinter, M.
+RFC 1738: "Uniform Resource Locators (URL)" by T. Berners-Lee, L. Masinter, M.
McCahill, December 1994
-RFC 3986 is considered the current standard and any changes to urlparse module
-should conform to this. urlparse module is not entirely compliant with this.
-The defacto scenarios of parsing are considered sometimes and for backward
-compatiblity purposes, older RFC uses of parsing are retained. The testcases in
+RFC 3986 is considered the current standard and any future changes to
+urlparse module should conform with it. The urlparse module is
+currently not entirely compliant with this RFC due to defacto
+scenarios for parsing, and for backward compatibility purposes, some
+parsing quirks from older RFCs are retained. The testcases in
test_urlparse.py provides a good indicator of parsing behavior.
"""
@@ -34,7 +35,7 @@
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
'imap', 'wais', 'file', 'mms', 'https', 'shttp',
'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
- 'svn', 'svn+ssh', 'sftp']
+ 'svn', 'svn+ssh', 'sftp','nfs','git', 'git+ssh']
non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',