summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-08-24 16:15:46 (GMT)
committerGeorg Brandl <georg@python.org>2012-08-24 16:15:46 (GMT)
commit491b1dc79efd4d3fc39b0ded2cd3fd746154b882 (patch)
tree0b46e1361982dbc62c4c1cc7b24152b7f45eb2c4 /Lib/urllib
parent82649f3b873f470941d5226802dd3c0e45221173 (diff)
parenta61b09f406fe5bada60af5d2e23a75b9de87ebb5 (diff)
downloadcpython-491b1dc79efd4d3fc39b0ded2cd3fd746154b882.zip
cpython-491b1dc79efd4d3fc39b0ded2cd3fd746154b882.tar.gz
cpython-491b1dc79efd4d3fc39b0ded2cd3fd746154b882.tar.bz2
Closes #9374: merge with 3.2
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/parse.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index c8eddf2..4811759 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -48,6 +48,16 @@ uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips',
'mms', '', 'sftp']
+# These are not actually used anymore, but should stay for backwards
+# compatibility. (They are undocumented, but have a public-looking name.)
+non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
+ 'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
+uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms',
+ 'gopher', 'rtsp', 'rtspu', 'sip', 'sips', '']
+uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news',
+ 'nntp', 'wais', 'https', 'shttp', 'snews',
+ 'file', 'prospero', '']
+
# Characters valid in scheme names
scheme_chars = ('abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'