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
parent a1c086a807
commit dd285b67d1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/networking/page.py
View File

@ -23,16 +23,16 @@ def headers(url):
if o.netloc == "": if o.netloc == "":
raise IRCException("invalid URL") raise IRCException("invalid URL")
if o.scheme == "http": if o.scheme == "http":
conn = http.client.HTTPConnection(o.netloc, port=o.port, timeout=5) conn = http.client.HTTPConnection(o.hostname, port=o.port, timeout=5)
else: else:
conn = http.client.HTTPSConnection(o.netloc, port=o.port, timeout=5) conn = http.client.HTTPSConnection(o.hostname, port=o.port, timeout=5)
try: try:
conn.request("HEAD", o.path, None, {"User-agent": "Nemubot v3"}) conn.request("HEAD", o.path, None, {"User-agent": "Nemubot v3"})
except socket.timeout: except socket.timeout:
raise IRCException("request timeout") raise IRCException("request timeout")
except socket.gaierror: except socket.gaierror:
print ("<tools.web> Unable to receive page %s from %s on %d." print ("<tools.web> Unable to receive page %s from %s on %d."
% (o.path, o.netloc, o.port)) % (o.path, o.hostname, o.port))
raise IRCException("an unexpected error occurs") raise IRCException("an unexpected error occurs")
try: try:

8
tools/web.py
View File

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