Merged revisions 81132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81132 | senthil.kumaran | 2010-05-13 09:07:23 +0530 (Thu, 13 May 2010) | 9 lines
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/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 00c4a0a..17cdf9e 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -104,7 +104,12 @@
('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/',
'', '', ''),
('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/',
- '', ''))
+ '', '')),
+ ('git+ssh://git@github.com/user/project.git',
+ ('git+ssh', 'git@github.com','/user/project.git',
+ '','',''),
+ ('git+ssh', 'git@github.com','/user/project.git',
+ '', ''))
]
for url, parsed, split in testcases:
self.checkRoundtrips(url, parsed, split)
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index bdb2cd7..1ac6f4d 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -38,7 +38,7 @@
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
'imap', 'wais', 'file', 'mms', 'https', 'shttp',
'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
- 'svn', 'svn+ssh', 'sftp','nfs']
+ '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',