From 06b5e04b0b458f41ab5ca119a3d146d7b55223f4 Mon Sep 17 00:00:00 2001 From: spline Date: Wed, 22 Oct 2014 17:47:39 +0300 Subject: [PATCH] Unix: fix fortune on Python 3 Closes #888 --- plugins/Unix/plugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/Unix/plugin.py b/plugins/Unix/plugin.py index 8ceb2b799..0f2495739 100644 --- a/plugins/Unix/plugin.py +++ b/plugins/Unix/plugin.py @@ -221,8 +221,12 @@ class Unix(callbacks.Plugin): 'not available.'), Raise=True) (out, err) = inst.communicate() inst.wait() - lines = out.splitlines() - lines = list(map(str.rstrip, lines)) + if sys.version_info[0] > 2: + lines = [i.decode('utf-8').rstrip() for i in out.splitlines()] + lines = list(map(str, lines)) + else: + lines = out.splitlines() + lines = list(map(str.rstrip, lines)) lines = filter(None, lines) irc.replies(lines, joiner=' ') else: