nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Indicate full version in UserAgent HTTP header

Browse Source
This commit is contained in:
nemunaire 2015-01-01 21:46:57 +01:00
parent 1a04a107ac
commit 0d21b1fa2c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/networking/page.py
View File

@ -4,6 +4,7 @@ import subprocess
import tempfile import tempfile
import urllib import urllib
from bot import __version__
from tools import web from tools import web
@ -27,7 +28,8 @@ def headers(url):
else: else:
conn = http.client.HTTPSConnection(o.hostname, 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 v%s" % __version__})
except socket.timeout: except socket.timeout:
raise IRCException("request timeout") raise IRCException("request timeout")
except socket.gaierror: except socket.gaierror:

6
tools/web.py
View File

@ -25,6 +25,7 @@ from urllib.parse import quote
from urllib.parse import urlparse from urllib.parse import urlparse
from urllib.request import urlopen from urllib.request import urlopen
from bot import __version__
from exception import IRCException from exception import IRCException
from tools.xmlparser import parse_string from tools.xmlparser import parse_string
@ -87,9 +88,10 @@ def getURLContent(url, timeout=15):
try: try:
if o.query != '': if o.query != '':
conn.request("GET", o.path + "?" + o.query, conn.request("GET", o.path + "?" + o.query,
None, {"User-agent": "Nemubot v3"}) None, {"User-agent": "Nemubot v%s" % __version__})
else: else:
conn.request("GET", o.path, None, {"User-agent": "Nemubot v3"}) conn.request("GET", o.path, None, {"User-agent":
"Nemubot v%s" % __version__})
except socket.timeout: except socket.timeout:
return None return None
except OSError: # [Errno 113] No route to host except OSError: # [Errno 113] No route to host