arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utils.parse now returns a triple (host, port, ssl)

Browse Source
This commit is contained in:
Martin Zimmermann 2013-10-27 12:48:34 +01:00
parent acbf42f89d
commit 11293a504b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
isso/utils/parse.py
View File

@ -45,19 +45,21 @@ def host(name):
Parse :param name: into `httplib`-compatible host:port. Parse :param name: into `httplib`-compatible host:port.
>>> print(host("http://example.tld/")) >>> print(host("http://example.tld/"))
('example.tld', 80) ('example.tld', 80, False)
>>> print(host("https://example.tld/")) >>> print(host("https://example.tld/"))
('example.tld', 443) ('example.tld', 443, True)
>>> print(host("example.tld")) >>> print(host("example.tld"))
('example.tld', 80) ('example.tld', 80, False)
>>> print(host("example.tld:42")) >>> print(host("example.tld:42"))
('example.tld', 42) ('example.tld', 42, False)
>>> print(host("https://example.tld:80/"))
('example.tld', 80, True)
""" """
if not name.startswith(('http://', 'https://')): if not name.startswith(('http://', 'https://')):
name = 'http://' + name name = 'http://' + name
rv = urlparse(name) rv = urlparse(name)
if rv.scheme == 'https': if rv.scheme == 'https' and rv.port is None:
return (rv.netloc, 443) return (rv.netloc, 443, True)
return (rv.netloc.rsplit(':')[0], rv.port or 80) return (rv.netloc.rsplit(':')[0], rv.port or 80, rv.scheme == 'https')