nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

fix netloc != hostname

Browse source
This commit is contained in:
nemunaire 2014-12-16 00:45:01 +01:00
commit dd285b67d1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/web.py
View file

@ -43,7 +43,7 @@ def getScheme(url):
def getHost(url):
"""Return the domain of a given URL"""
return urlparse(url).netloc
return urlparse(url).hostname
def getPort(url):
@ -75,13 +75,13 @@ def getURLContent(url, timeout=15):
o = urlparse("http://" + url)
if o.scheme == "http":
conn = http.client.HTTPConnection(o.netloc, port=o.port,
conn = http.client.HTTPConnection(o.hostname, port=o.port,
timeout=timeout)
elif o.scheme == "https":
conn = http.client.HTTPSConnection(o.netloc, port=o.port,
conn = http.client.HTTPSConnection(o.hostname, port=o.port,
timeout=timeout)
elif o.scheme is None or o.scheme == "":
conn = http.client.HTTPConnection(o.netloc, port=80, timeout=timeout)
conn = http.client.HTTPConnection(o.hostname, port=80, timeout=timeout)
else:
return None
try: