git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch from popen2 to subprocess (fix deprecation warnings)
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
Idler.py
diff --git
a/sql-edition/servers/Idler.py
b/sql-edition/servers/Idler.py
index
ff73c2a
..
5b66455
100755
(executable)
--- a/
sql-edition/servers/Idler.py
+++ b/
sql-edition/servers/Idler.py
@@
-1,6
+1,7
@@
#!/usr/bin/env python
#!/usr/bin/env python
-import string, time, popen2, os
+import string, time, os
+from subprocess import Popen, PIPE
from random import random
from MessageKeeper import MessageKeeper
from random import random
from MessageKeeper import MessageKeeper
@@
-281,10
+282,8
@@
class FortuneIdler(StringIdler):
fortune = "/usr/games/fortune"
text = "I broke my wookie...."
if os.access(fortune,os.F_OK|os.X_OK):
fortune = "/usr/games/fortune"
text = "I broke my wookie...."
if os.access(fortune,os.F_OK|os.X_OK):
- (stdout, stdin) = popen2.popen2(fortune)
- text = string.join(stdout.readlines())
- stdout.close()
- stdin.close()
+ (lines, unused) = Popen((fortune,), close_fds=True, stdout=PIPE).communicate()
+ text = string.join(lines)
StringIdler.__init__(self, v, text,repeat=False)
def affinity(self):
StringIdler.__init__(self, v, text,repeat=False)
def affinity(self):
@@
-294,10
+293,8
@@
class PipeIdler(StringIdler):
def __init__(self, v, command, args):
text = "I ate my cookie...."
if os.access(command,os.F_OK|os.X_OK):
def __init__(self, v, command, args):
text = "I ate my cookie...."
if os.access(command,os.F_OK|os.X_OK):
- (stdout, stdin) = popen2.popen2(command+' '+args)
- text = string.join(stdout.readlines())
- stdout.close()
- stdin.close()
+ (lines, unused) = Popen([command,] + args.split(), close_fds=True, stdout=PIPE).communicate()
+ text = string.join(lines)
StringIdler.__init__(self, v, text,repeat=False)
def affinity(self):
StringIdler.__init__(self, v, text,repeat=False)
def affinity(self):
UCC
git Repository :: git.ucc.asn.au