From f432aeca7c483ff031bb708e5b3bf80f847e9c1a Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Wed, 3 Aug 2011 18:31:59 +0800 Subject: [PATCH] Fix closes issue12683 - urljoin to work with relative join of svn scheme. --- Lib/test/test_urlparse.py | 1 + Lib/urlparse.py | 3 ++- Misc/NEWS | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index 127409e0419..e9763492c0b 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -339,6 +339,7 @@ class UrlParseTestCase(unittest.TestCase): self.checkJoin('http:///', '..','http:///') 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('svn://pathtorepo/dir1','dir2','svn://pathtorepo/dir2') def test_RFC2732(self): for url, hostname, port in [ diff --git a/Lib/urlparse.py b/Lib/urlparse.py index e5528face6f..2d53603c898 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -34,7 +34,8 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag", # A classification of schemes ('' means apply by default) uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file', 'https', 'shttp', 'mms', - 'prospero', 'rtsp', 'rtspu', '', 'sftp'] + 'prospero', 'rtsp', 'rtspu', '', 'sftp', + 'svn'] uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', 'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '', diff --git a/Misc/NEWS b/Misc/NEWS index e8243321573..585a56c75d6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,9 @@ Core and Builtins 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. - Issues #11104, #8688: Fix the behavior of distutils' sdist command with