From ef30dc872b895245b24aae85e808638a928d14f1 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 7 Jan 2003 02:09:16 +0000 Subject: [PATCH] Revert change 1.37. The nanoseconds saved by using dict.fromkeys aren't worth the loss in clarity. Linear searches live on. --- Lib/urlparse.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 01064691de1..9681c7c96d4 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -8,22 +8,22 @@ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag", "urlsplit", "urlunsplit"] # A classification of schemes ('' means apply by default) -uses_relative = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'imap', +uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap', 'wais', 'file', 'https', 'shttp', 'mms', - 'prospero', 'rtsp', 'rtspu', '']) -uses_netloc = dict.fromkeys(['ftp', 'http', 'gopher', 'nntp', 'telnet', + 'prospero', 'rtsp', 'rtspu', ''] +uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet', 'imap', 'wais', 'file', 'mms', 'https', 'shttp', - 'snews', 'prospero', 'rtsp', 'rtspu', '']) -non_hierarchical = dict.fromkeys(['gopher', 'hdl', 'mailto', 'news', - 'telnet', 'wais', 'imap', 'snews', 'sip']) -uses_params = dict.fromkeys(['ftp', 'hdl', 'prospero', 'http', 'imap', + 'snews', 'prospero', 'rtsp', 'rtspu', ''] +non_hierarchical = ['gopher', 'hdl', 'mailto', 'news', + 'telnet', 'wais', 'imap', 'snews', 'sip'] +uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap', 'https', 'shttp', 'rtsp', 'rtspu', 'sip', - 'mms', '']) -uses_query = dict.fromkeys(['http', 'wais', 'imap', 'https', 'shttp', 'mms', - 'gopher', 'rtsp', 'rtspu', 'sip', '']) -uses_fragment = dict.fromkeys(['ftp', 'hdl', 'http', 'gopher', 'news', + 'mms', ''] +uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms', + 'gopher', 'rtsp', 'rtspu', 'sip', ''] +uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news', 'nntp', 'wais', 'https', 'shttp', 'snews', - 'file', 'prospero', '']) + 'file', 'prospero', ''] # Characters valid in scheme names scheme_chars = ('abcdefghijklmnopqrstuvwxyz'