Skip to content

Commit

Permalink
fix encode crash on irc notice
Browse files Browse the repository at this point in the history
  • Loading branch information
undeath committed Dec 11, 2018
1 parent 3ae5bff commit 9ce9ee5
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions jmdaemon/jmdaemon/irc.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,20 @@
def wlog(*x):
"""Simplifier to add lists to the debug log
"""
def conv(s):
# note: this only works because of the future package
if isinstance(s, str):
return s
elif isinstance(s, bytes):
return s.decode('utf-8', errors='ignore')
else:
return str(s)

if x[0] == "WARNING":
msg = " ".join([str(a) for a in x[1:]])
msg = " ".join([conv(a) for a in x[1:]])
log.warn(msg)
else:
msg = " ".join([str(a) for a in x])
msg = " ".join([conv(a) for a in x])
log.debug(msg)

def get_irc_text(line):
Expand Down Expand Up @@ -402,4 +411,4 @@ def left(self, channel):
#wlog('(unhandled) left: ', channel)

def noticed(self, user, channel, message):
wlog('(unhandled) noticed: ', user, channel, message)
wlog('(unhandled) noticed: ', user, channel, message)

0 comments on commit 9ce9ee5

Please sign in to comment.