Commit 1433a024 authored by Mark Tearle's avatar Mark Tearle
Browse files

BUGFIX: FIx up strings in idler

parent a214f628
...@@ -283,7 +283,7 @@ class FortuneIdler(StringIdler): ...@@ -283,7 +283,7 @@ class FortuneIdler(StringIdler):
text = "I broke my wookie...." text = "I broke my wookie...."
if os.access(fortune,os.F_OK|os.X_OK): if os.access(fortune,os.F_OK|os.X_OK):
(lines, unused) = Popen((fortune,), close_fds=True, stdout=PIPE).communicate() (lines, unused) = Popen((fortune,), close_fds=True, stdout=PIPE).communicate()
text = string.join(lines) text = lines.replace('\n', ' ').replace('\r', '')
StringIdler.__init__(self, v, text,repeat=False) StringIdler.__init__(self, v, text,repeat=False)
def affinity(self): def affinity(self):
...@@ -294,7 +294,7 @@ class PipeIdler(StringIdler): ...@@ -294,7 +294,7 @@ class PipeIdler(StringIdler):
text = "I ate my cookie...." text = "I ate my cookie...."
if os.access(command,os.F_OK|os.X_OK): if os.access(command,os.F_OK|os.X_OK):
(lines, unused) = Popen([command,] + args.split(), close_fds=True, stdout=PIPE).communicate() (lines, unused) = Popen([command,] + args.split(), close_fds=True, stdout=PIPE).communicate()
text = string.join(lines) text = lines.replace('\n', ' ').replace('\r', '')
StringIdler.__init__(self, v, text,repeat=False) StringIdler.__init__(self, v, text,repeat=False)
def affinity(self): def affinity(self):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment