diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-05-13 03:37:23 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-05-13 03:37:23 (GMT) |
| commit | ead169d3114ed0f1041b5b59ca20293449608c50 (patch) | |
| tree | 9d7408c8d13cb047b4d33213729ea24da5d538ff /Lib | |
| parent | 91f021fb702ba1a98b02e8c9996ee0eb51714d99 (diff) | |
| download | cpython-ead169d3114ed0f1041b5b59ca20293449608c50.zip cpython-ead169d3114ed0f1041b5b59ca20293449608c50.tar.gz cpython-ead169d3114ed0f1041b5b59ca20293449608c50.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_urlparse.py | 7 | ||||
| -rw-r--r-- | Lib/urllib/parse.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index e930e19..400decd 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -104,7 +104,12 @@ class UrlParseTestCase(unittest.TestCase): ('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 3d541a7..a391fac 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -41,7 +41,7 @@ uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 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', |