home
·
contact
·
privacy
projects
/
plomlombot-irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle UnicodeDecodeError.
[plomlombot-irc.git]
/
plomlombot.py
diff --git
a/plomlombot.py
b/plomlombot.py
index a47158c302a3341cbe3e3777410b6e073c0a485d..7d0f5355a1f70eb1cc946249d1d5e76154b33b49 100755
(executable)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-7,6
+7,7
@@
import select
import time
import re
import urllib.request
import time
import re
import urllib.request
+import http.client
import html
# Defaults, may be overwritten by command line arguments.
import html
# Defaults, may be overwritten by command line arguments.
@@
-99,13
+100,17
@@
def lineparser_loop(io, nickname):
def act_on_privmsg(tokens):
def url_check(msg):
def act_on_privmsg(tokens):
def url_check(msg):
- matches = re.findall("(https?://[^\s]+)", msg)
+ matches = re.findall("(https?://[^\s
>
]+)", msg)
for i in range(len(matches)):
url = matches[i]
for i in range(len(matches)):
url = matches[i]
+ request = urllib.request.Request(url, headers={
+ "User-Agent": "plomlombot"
+ })
try:
try:
- webpage = urllib.request.urlopen(
url
, timeout=15)
+ webpage = urllib.request.urlopen(
request
, timeout=15)
except (urllib.error.HTTPError, urllib.error.URLError,
except (urllib.error.HTTPError, urllib.error.URLError,
- UnicodeError) as error:
+ UnicodeError, http.client.BadStatusLine,
+ UnicodeDecodeError) as error:
print("TROUBLE FOLLOWING URL: " + str(error))
continue
charset = webpage.info().get_content_charset()
print("TROUBLE FOLLOWING URL: " + str(error))
continue
charset = webpage.info().get_content_charset()
@@
-120,7
+125,7
@@
def lineparser_loop(io, nickname):
content = webpage.read().decode(charset)
title = str(content).split('<title>')[1].split('</title>')[0]
title = html.unescape(title)
content = webpage.read().decode(charset)
title = str(content).split('<title>')[1].split('</title>')[0]
title = html.unescape(title)
- io.send_line("
PRIVMSG
" + target + " :page title for url: "
+ io.send_line("
NOTICE
" + target + " :page title for url: "
+ title)
sender = ""
+ title)
sender = ""
@@
-141,7
+146,7
@@
def lineparser_loop(io, nickname):
msg = str.join(" ", tokens[3:])[1:]
url_check(msg)
msg = str.join(" ", tokens[3:])[1:]
url_check(msg)
- while
1
:
+ while
True
:
line = io.recv_line()
if not line:
continue
line = io.recv_line()
if not line:
continue
@@
-177,7
+182,7
@@
def parse_command_line_arguments():
return opts
opts = parse_command_line_arguments()
return opts
opts = parse_command_line_arguments()
-while
1
:
+while
True
:
try:
io = init_session(opts.server, opts.port, opts.timeout, opts.nickname,
opts.username, opts.CHANNEL)
try:
io = init_session(opts.server, opts.port, opts.timeout, opts.nickname,
opts.username, opts.CHANNEL)