diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-05-13 03:25:21 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-05-13 03:25:21 (GMT) |
| commit | 81a0450cb55ac0887c8d59b5750f66aa00bd8be1 (patch) | |
| tree | c88b64cde7468dd5be0c4ff95105e4c63972e729 | |
| parent | 62f7e8b0b8e068a0281d737dba73d063cad4b31c (diff) | |
| download | cpython-81a0450cb55ac0887c8d59b5750f66aa00bd8be1.zip cpython-81a0450cb55ac0887c8d59b5750f66aa00bd8be1.tar.gz cpython-81a0450cb55ac0887c8d59b5750f66aa00bd8be1.tar.bz2 | |
Fix Issue8657 - adding git and git+ssh as know schemes.
| -rw-r--r-- | Lib/test/test_urlparse.py | 7 | ||||
| -rw-r--r-- | Lib/urlparse.py | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index b45fef9..07256a2 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -103,7 +103,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/urlparse.py b/Lib/urlparse.py index 7f3a9a4..65bb9cb 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -38,7 +38,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', |