Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix closes issue12683 - urljoin to work with relative join of svn scheme.

This commit is contained in:
Senthil Kumaran 2011-08-03 18:31:59 +08:00
parent c1ee4ef9dc
commit f432aeca7c
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_urlparse.py
View File

@ -339,6 +339,7 @@ class UrlParseTestCase(unittest.TestCase):
self.checkJoin('http:///', '..','http:///') self.checkJoin('http:///', '..','http:///')
self.checkJoin('', 'http://a/b/c/g?y/./x','http://a/b/c/g?y/./x') self.checkJoin('', 'http://a/b/c/g?y/./x','http://a/b/c/g?y/./x')
self.checkJoin('', 'http://a/./g', 'http://a/./g') self.checkJoin('', 'http://a/./g', 'http://a/./g')
self.checkJoin('svn://pathtorepo/dir1','dir2','svn://pathtorepo/dir2')
def test_RFC2732(self): def test_RFC2732(self):
for url, hostname, port in [ for url, hostname, port in [

3
Lib/urlparse.py
View File

@ -34,7 +34,8 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
# A classification of schemes ('' means apply by default) # A classification of schemes ('' means apply by default)
uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap',
'wais', 'file', 'https', 'shttp', 'mms', 'wais', 'file', 'https', 'shttp', 'mms',
'prospero', 'rtsp', 'rtspu', '', 'sftp'] 'prospero', 'rtsp', 'rtspu', '', 'sftp',
'svn']
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', '',

3
Misc/NEWS
View File

@ -37,6 +37,9 @@ Core and Builtins
Library Library
------- -------
- Issue #12683: urlparse updated to include svn as schemes that uses relative
paths. (svn from 1.5 onwards support relative path).
- Issue #11933: Fix incorrect mtime comparison in distutils. - Issue #11933: Fix incorrect mtime comparison in distutils.
- Issues #11104, #8688: Fix the behavior of distutils' sdist command with - Issues #11104, #8688: Fix the behavior of distutils' sdist command with