[Python-checkins] r70760 - in python/branches/py3k/Lib: test/test_urllib.py test/test_urlparse.py urllib/parse.py
senthil.kumaran
python-checkins at python.org
Mon Mar 30 23:54:42 CEST 2009
Author: senthil.kumaran
Date: Mon Mar 30 23:54:41 2009
New Revision: 70760
Log:
Fix for Issue4962, issue4675.
Modified:
python/branches/py3k/Lib/test/test_urllib.py
python/branches/py3k/Lib/test/test_urlparse.py
python/branches/py3k/Lib/urllib/parse.py
Modified: python/branches/py3k/Lib/test/test_urllib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib.py (original)
+++ python/branches/py3k/Lib/test/test_urllib.py Mon Mar 30 23:54:41 2009
@@ -830,6 +830,21 @@
"url2pathname() failed; %s != %s" %
(expect, result))
+class Utility_Tests(unittest.TestCase):
+ """Testcase to test the various utility functions in the urllib."""
+
+ def test_splitpasswd(self):
+ """Some of password examples are not sensible, but it is added to
+ confirming to RFC2617 and addressing issue4675.
+ """
+ self.assertEqual(('user', 'ab'),urllib.parse.splitpasswd('user:ab'))
+ self.assertEqual(('user', 'a\nb'),urllib.parse.splitpasswd('user:a\nb'))
+ self.assertEqual(('user', 'a\tb'),urllib.parse.splitpasswd('user:a\tb'))
+ self.assertEqual(('user', 'a\rb'),urllib.parse.splitpasswd('user:a\rb'))
+ self.assertEqual(('user', 'a\fb'),urllib.parse.splitpasswd('user:a\fb'))
+ self.assertEqual(('user', 'a\vb'),urllib.parse.splitpasswd('user:a\vb'))
+ self.assertEqual(('user', 'a:b'),urllib.parse.splitpasswd('user:a:b'))
+
# Just commented them out.
# Can't really tell why keep failing in windows and sparc.
# Everywhere else they work ok, but on those machines, someteimes
@@ -920,6 +935,7 @@
UnquotingTests,
urlencode_Tests,
Pathname_Tests,
+ Utility_Tests,
#FTPWrapperTests,
)
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 Mon Mar 30 23:54:41 2009
@@ -97,6 +97,9 @@
'', '', ''),
('mms', 'wms.sys.hinet.net', '/cts/Drama/09006251100.asf',
'', '')),
+ ('nfs://server/path/to/file.txt',
+ ('nfs', 'server', '/path/to/file.txt', '', '', ''),
+ ('nfs', 'server', '/path/to/file.txt', '', '')),
('svn+ssh://svn.zope.org/repos/main/ZConfig/trunk/',
('svn+ssh', 'svn.zope.org', '/repos/main/ZConfig/trunk/',
'', '', ''),
Modified: python/branches/py3k/Lib/urllib/parse.py
==============================================================================
--- python/branches/py3k/Lib/urllib/parse.py (original)
+++ python/branches/py3k/Lib/urllib/parse.py Mon Mar 30 23:54:41 2009
@@ -19,7 +19,7 @@
uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
'imap', 'wais', 'file', 'mms', 'https', 'shttp',
'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
- 'svn', 'svn+ssh', 'sftp']
+ 'svn', 'svn+ssh', 'sftp','nfs']
non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
@@ -645,7 +645,7 @@
global _passwdprog
if _passwdprog is None:
import re
- _passwdprog = re.compile('^([^:]*):(.*)$')
+ _passwdprog = re.compile('^([^:]*):(.*)$',re.S)
match = _passwdprog.match(user)
if match: return match.group(1, 2)
More information about the Python-checkins
mailing list