summaryrefslogtreecommitdiffstats
path: root/Reaktor/IRC
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-12-19 01:49:43 +0100
committerlassulus <lassulus@googlemail.com>2013-12-19 01:49:43 +0100
commitec557236d0482a9f9285f803e1828d5f555e9ac8 (patch)
treecfb2da6ef1eecfb8501154908819041d7302d9fd /Reaktor/IRC
parent19a51b7462dea61483c52e941c5d5d7d69ee21bb (diff)
Reaktor/IRC: encode/decode harder/better/faster
Diffstat (limited to 'Reaktor/IRC')
-rwxr-xr-xReaktor/IRC/asybot.py14
-rw-r--r--Reaktor/IRC/translate_colors.py2
2 files changed, 9 insertions, 7 deletions
diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 0ac7a279..d02a5747 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -46,7 +46,8 @@ class asybot(asychat):
self.hostname = getconf('irc_nickname')
self.ircname = getconf('irc_nickname')
self.data = ''
- self.set_terminator('\r\n'.encode(encoding='UTF-8'))
+ self.myterminator = '\r\n'
+ self.set_terminator(self.myterminator.encode())
self.create_socket(AF_INET, SOCK_STREAM)
self.connect((self.server, self.port))
self.wrapper = TextWrapper(subsequent_indent=" ",width=400)
@@ -108,7 +109,8 @@ class asybot(asychat):
self.reset_alarm()
def push(self, message):
- msg = (message + self.get_terminator().decode(encoding='UTF-8')).encode(encoding='UTF-8')
+ log.debug('>> %s' % message)
+ msg = (message + self.myterminator).encode()
log.debug('>> %s' % msg)
asychat.push(self, msg)
@@ -120,14 +122,14 @@ class asybot(asychat):
def on_privmsg(self, prefix, command, params, rest):
def PRIVMSG(text):
- for line in self.wrapper.wrap(text.decode(encoding='UTF-8')):
+ for line in self.wrapper.wrap(text):
msg = 'PRIVMSG %s :%s' % (','.join(params), line)
log.info(msg)
self.push(msg)
sleep(1)
def ME(text):
- PRIVMSG(('ACTION ' + text + '').encode(encoding='UTF-8'))
+ PRIVMSG(('ACTION ' + text + ''))
for command in getconf('commands'):
y = match(command['pattern'], rest)
@@ -155,9 +157,9 @@ class asybot(asychat):
log.error('OSError@%s: %s' % (myargv, error))
return
pid = p.pid
- for line in iter(p.stdout.readline, ''.encode(encoding='UTF-8')):
+ for line in iter(p.stdout.readline, ''.encode()):
try:
- PRIVMSG(translate_colors(line))
+ PRIVMSG(translate_colors(line.decode()))
except Exception as error:
log.error('no send: %s' % error)
log.debug('%s stdout: %s' % (pid, line))
diff --git a/Reaktor/IRC/translate_colors.py b/Reaktor/IRC/translate_colors.py
index 3ea34be6..bd716618 100644
--- a/Reaktor/IRC/translate_colors.py
+++ b/Reaktor/IRC/translate_colors.py
@@ -23,7 +23,7 @@ COLOR_MAP = {
}
def translate_colors (line):
for color,replace in COLOR_MAP.items():
- line = line.replace(color.encode(encoding='UTF-8'),replace.encode(encoding='UTF-8'))
+ line = line.replace(color,replace)
return line
if __name__ == "__main__":