X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=blobdiff_plain;f=plomlombot.py;h=2b59a0b9a5bc5331c21988dbc8997b8dbefefff6;hb=9385b26b0c173828699e414544671f421bbff355;hp=0b605e9946b04f79a8f3e843da56eee2b59b0169;hpb=0d17c0577b6e816dc1c6e02667fc03f74ef5f4a8;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 0b605e9..2b59a0b 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -6,9 +6,8 @@ import datetime import select import time import re -import urllib.request -import http.client -import html +import requests +import bs4 # Defaults, may be overwritten by command line arguments. SERVER = "irc.freenode.net" @@ -111,28 +110,19 @@ def lineparser_loop(io, nickname): matches = re.findall("(https?://[^\s>]+)", msg) for i in range(len(matches)): url = matches[i] - request = urllib.request.Request(url, headers={ - "User-Agent": "plomlombot" - }) try: - webpage = urllib.request.urlopen(request, timeout=15) - except (urllib.error.HTTPError, urllib.error.URLError, - UnicodeError, http.client.BadStatusLine) as error: + r = requests.get(url, timeout=15) + except (requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectionError, + requests.exceptions.InvalidURL, + requests.exceptions.InvalidSchema) as error: notice("TROUBLE FOLLOWING URL: " + str(error)) continue - charset = webpage.info().get_content_charset() - if not charset: - charset = "utf-8" - content_type = webpage.info().get_content_type() - if content_type not in ('text/html', 'text/xml', - 'application/xhtml+xml'): - notice("TROUBLE READING PAGE TITLE: bad content type " - + content_type) - continue - content = webpage.read().decode(charset) - title = str(content).split('