diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
commit | 1f7df8f2070391f28391e3594580c07e11b6b32b (patch) | |
tree | ec03dfe4f71df3840232731145b8f6736fc6a314 /Lib/urlparse.py | |
parent | b25d611f8d9140e83acbfffb6b0579939c88c033 (diff) | |
parent | 10e93a6d40502e100c68090730e0b3190df97854 (diff) | |
download | cpython-git-1f7df8f2070391f28391e3594580c07e11b6b32b.tar.gz |
merge heads
Diffstat (limited to 'Lib/urlparse.py')
-rw-r--r-- | Lib/urlparse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py index abc53c616a..f370ce3bdc 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -42,7 +42,7 @@ uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'svn', 'svn+ssh', 'sftp','nfs','git', 'git+ssh'] uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', 'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips', - 'mms', '', 'sftp'] + 'mms', '', 'sftp', 'tel'] # These are not actually used anymore, but should stay for backwards # compatibility. (They are undocumented, but have a public-looking name.) |