Rooba
/
boltons
mirror of https://github.com/mahmoud/boltons.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

urlutils: SCHEME_PORT_MAP is more descriptive than DEFAULT_PORT_MAP

This commit is contained in:
Mahmoud Hashemi 2017-03-15 09:36:34 -07:00
parent 27305a1e98
commit c841a95323
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boltons/urlutils.py
View File

@ -58,7 +58,7 @@ _QUERY_SAFE = _UNRESERVED_CHARS | _FRAGMENT_SAFE - set(u'&=+')
# https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
# and
# https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml
DEFAULT_PORT_MAP = {'acap': 674, 'afp': 548, 'dict': 2628, 'dns': 53,
SCHEME_PORT_MAP = {'acap': 674, 'afp': 548, 'dict': 2628, 'dns': 53,
'file': None, 'ftp': 21, 'git': 9418, 'gopher': 70,
'http': 80, 'https': 443, 'imap': 143, 'ipp': 631,
'ipps': 631, 'irc': 194, 'ircs': 6697, 'ldap': 389,
@ -304,7 +304,7 @@ def register_scheme(text, uses_netloc=None, default_port=None):
% (default_port,))
if uses_netloc is True:
DEFAULT_PORT_MAP[text] = default_port
SCHEME_PORT_MAP[text] = default_port
elif uses_netloc is False:
NO_NETLOC_SCHEMES.add(text)
elif uses_netloc is not None:
@ -532,11 +532,11 @@ class URL(object):
mockscheme:hello:world
"""
default = self._netloc_sep
if self.scheme in DEFAULT_PORT_MAP:
if self.scheme in SCHEME_PORT_MAP:
return True
if self.scheme in NO_NETLOC_SCHEMES:
return False
if self.scheme.split('+')[-1] in DEFAULT_PORT_MAP:
if self.scheme.split('+')[-1] in SCHEME_PORT_MAP:
return True
return default
@ -549,9 +549,9 @@ class URL(object):
Applies the same '+' heuristic detailed in :meth:`URL.uses_netloc`.
"""
try:
return DEFAULT_PORT_MAP[self.scheme]
return SCHEME_PORT_MAP[self.scheme]
except KeyError:
return DEFAULT_PORT_MAP.get(self.scheme.split('+')[-1])
return SCHEME_PORT_MAP.get(self.scheme.split('+')[-1])
def normalize(self, with_case=True):
"""Resolve any "." and ".." references in the path, as well as