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
Add idna Unicode decoding error handler to URL follower.
[plomlombot-irc.git]
/
plomlombot.py
diff --git
a/plomlombot.py
b/plomlombot.py
index 786b072bf483d1c69cfd19e18c18895214bbbf6b..ed0279279076217fb192ce3f49a76c570d90c111 100755
(executable)
--- a/
plomlombot.py
+++ b/
plomlombot.py
@@
-226,7
+226,7
@@
def handle_command(command, argument, notice, target, session):
msg = ""
while 1:
new_end = markov(snippet)
msg = ""
while 1:
new_end = markov(snippet)
- for name in session.uses_in_chan:
+ for name in session.use
r
s_in_chan:
if new_end[:len(name)] == name.lower():
new_end = "malkovich" + new_end[len(name):]
break
if new_end[:len(name)] == name.lower():
new_end = "malkovich" + new_end[len(name):]
break
@@
-246,7
+246,7
@@
def handle_command(command, argument, notice, target, session):
def twt():
def try_open(mode):
try:
def twt():
def try_open(mode):
try:
- twtfile = open(session.twtfile,
"w"
)
+ twtfile = open(session.twtfile,
mode
)
except (PermissionError, FileNotFoundError) as err:
notice("CAN'T ACCESS OR CREATE TWT FILE: " + str(err))
return None
except (PermissionError, FileNotFoundError) as err:
notice("CAN'T ACCESS OR CREATE TWT FILE: " + str(err))
return None
@@
-293,6
+293,7
@@
def handle_url(url, notice, show_url=False):
except (requests.exceptions.TooManyRedirects,
requests.exceptions.ConnectionError,
requests.exceptions.InvalidURL,
except (requests.exceptions.TooManyRedirects,
requests.exceptions.ConnectionError,
requests.exceptions.InvalidURL,
+ UnicodeError,
requests.exceptions.InvalidSchema) as error:
notice("TROUBLE FOLLOWING URL: " + str(error))
return
requests.exceptions.InvalidSchema) as error:
notice("TROUBLE FOLLOWING URL: " + str(error))
return
@@
-314,7
+315,7
@@
class Session:
self.io = io
self.nickname = nickname
self.channel = channel
self.io = io
self.nickname = nickname
self.channel = channel
- self.uses_in_chan = []
+ self.use
r
s_in_chan = []
self.twtfile = twtfile
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
self.twtfile = twtfile
self.io.send_line("NICK " + self.nickname)
self.io.send_line("USER " + username + " 0 * : ")
@@
-382,14
+383,14
@@
class Session:
elif tokens[1] == "353":
names = tokens[5:]
names[0] = names[0][1:]
elif tokens[1] == "353":
names = tokens[5:]
names[0] = names[0][1:]
- self.uses_in_chan += names
+ self.use
r
s_in_chan += names
elif tokens[1] == "JOIN":
name = name_from_join_or_part(tokens)
if name != self.nickname:
elif tokens[1] == "JOIN":
name = name_from_join_or_part(tokens)
if name != self.nickname:
- self.uses_in_chan += [name]
+ self.use
r
s_in_chan += [name]
elif tokens[1] == "PART":
name = name_from_join_or_part(tokens)
elif tokens[1] == "PART":
name = name_from_join_or_part(tokens)
- del(self.use
s_in_chan[self.use
s_in_chan.index(name)])
+ del(self.use
rs_in_chan[self.user
s_in_chan.index(name)])
def parse_command_line_arguments():
parser = argparse.ArgumentParser()
def parse_command_line_arguments():
parser = argparse.ArgumentParser()