[Python-checkins] r81132 - in python/branches/py3k: Lib/test/test_urlparse.py Lib/urllib/parse.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Thu May 13 05:37:23 2010
New Revision: 81132

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_urlparse.py
   python/branches/py3k/Lib/urllib/parse.py

Modified: python/branches/py3k/Lib/test/test_urlparse.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urlparse.py	(original)
+++ python/branches/py3k/Lib/test/test_urlparse.py	Thu May 13 05:37:23 2010
@@ -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 at github.com','/user/project.git',
+             '','',''),
+            ('git+ssh', 'git at github.com','/user/project.git',
+             '', ''))
             ]
         for url, parsed, split in testcases:
             self.checkRoundtrips(url, parsed, split)

Modified: python/branches/py3k/Lib/urllib/parse.py
==============================================================================
--- python/branches/py3k/Lib/urllib/parse.py	(original)
+++ python/branches/py3k/Lib/urllib/parse.py	Thu May 13 05:37:23 2010
@@ -41,7 +41,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',