Merge pull request #889 from Mkaysi/fortune

Unix: fix fortune on Python 3
This commit is contained in:
Valentin Lorentz 2014-10-22 18:56:35 +02:00
commit 4c5b8c51d1

View File

@ -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: