mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
  ........
................
This commit is contained in:
Senthil Kumaran 2010-05-13 03:43:13 +00:00
parent 3d9fa6da93
commit d4cd18847d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_urlparse.py
View File

@ -104,6 +104,11 @@ def test_roundtrips(self):
('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/', ('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/',
'', '', ''), '', '', ''),
('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: for url, parsed, split in testcases:

2
Lib/urllib/parse.py
View File

@ -38,7 +38,7 @@
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
'imap', 'wais', 'file', 'mms', 'https', 'shttp', 'imap', 'wais', 'file', 'mms', 'https', 'shttp',
'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
'svn', 'svn+ssh', 'sftp','nfs'] 'svn', 'svn+ssh', 'sftp', 'nfs',' git', 'git+ssh']
non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
'telnet', 'wais', 'imap', 'snews', 'sip', 'sips'] 'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',