mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-14 14:49:21 +01:00
Switch from using the various popen flavors to subprocess.Popen
Signed-off-by: James Vega <jamessan@users.sourceforge.net>
This commit is contained in:
James Vega
parent
07e283f450
commit
fbdc44ca52
@ -1,5 +1,6 @@
|
||||
###
|
||||
# Copyright (c) 2002-2005, Jeremiah Fincher
|
||||
# Copyright (c) 2009, James Vega
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -31,6 +32,7 @@ import os
|
||||
import sys
|
||||
import time
|
||||
import threading
|
||||
import subprocess
|
||||
|
||||
import supybot.conf as conf
|
||||
import supybot.utils as utils
|
||||
@ -142,12 +144,17 @@ class Status(callbacks.Plugin):
|
||||
if plat.startswith('linux') or plat.startswith('sunos') or \
|
||||
plat.startswith('freebsd') or plat.startswith('openbsd') or \
|
||||
plat.startswith('darwin'):
|
||||
cmd = 'ps -o rss -p %s' % pid
|
||||
try:
|
||||
r = os.popen('ps -o rss -p %s' % pid)
|
||||
r.readline() # VSZ Header.
|
||||
mem = r.readline().strip()
|
||||
finally:
|
||||
r.close()
|
||||
inst = subprocess.Popen(cmd.split(), close_fds=True,
|
||||
stdin=file(os.devnull),
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
except OSError:
|
||||
irc.error('Unable to run ps command.', Raise=True)
|
||||
(out, _) = inst.communicate()
|
||||
inst.wait()
|
||||
mem = out.splitlines()[1]
|
||||
elif sys.platform.startswith('netbsd'):
|
||||
mem = '%s kB' % os.stat('/proc/%s/mem' % pid)[7]
|
||||
response += ' I\'m taking up %s kB of memory.' % mem
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
###
|
||||
# Copyright (c) 2002-2005, Jeremiah Fincher
|
||||
# Copyright (c) 2008, James Vega
|
||||
# Copyright (c) 2008-2009, James Vega
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -34,10 +34,10 @@ import pwd
|
||||
import sys
|
||||
import crypt
|
||||
import errno
|
||||
import popen2
|
||||
import random
|
||||
import select
|
||||
import struct
|
||||
import subprocess
|
||||
|
||||
import supybot.utils as utils
|
||||
from supybot.commands import *
|
||||
@ -130,46 +130,45 @@ class Unix(callbacks.Plugin):
|
||||
# We are only checking the first word
|
||||
spellCmd = self.registryValue('spell.command')
|
||||
if not spellCmd:
|
||||
irc.error('A spell checking command doesn\'t seem to be '
|
||||
'installed on this computer. If one is installed, '
|
||||
'reconfigure supybot.plugins.Unix.spell.command '
|
||||
'appropriately.', Raise=True)
|
||||
irc.error('The spell checking command is not configured. If one '
|
||||
'is installed, reconfigure '
|
||||
'supybot.plugins.Unix.spell.command appropriately.',
|
||||
Raise=True)
|
||||
if word and not word[0].isalpha():
|
||||
irc.error('<word> must begin with an alphabet character.')
|
||||
return
|
||||
if ' ' in word:
|
||||
irc.error('Spaces aren\'t allowed in the word.')
|
||||
return
|
||||
inst = popen2.Popen4([spellCmd, '-a'])
|
||||
(r, w) = (inst.fromchild, inst.tochild)
|
||||
try:
|
||||
s = r.readline() # Banner, hopefully.
|
||||
if 'sorry' in s.lower():
|
||||
irc.error(s)
|
||||
return
|
||||
w.write(word)
|
||||
w.write('\n')
|
||||
w.flush()
|
||||
try:
|
||||
line = pipeReadline(r)
|
||||
# aspell puts extra whitespace, ignore it
|
||||
while not line.strip('\r\n'):
|
||||
line = pipeReadline(r)
|
||||
# cache an extra line in case aspell's first line says the word
|
||||
# is spelled correctly, but subsequent lines offer spelling
|
||||
# suggestions
|
||||
line2 = pipeReadline(r)
|
||||
except TimeoutError:
|
||||
irc.error('The spell command timed out.')
|
||||
return
|
||||
finally:
|
||||
r.close()
|
||||
w.close()
|
||||
inst.wait()
|
||||
inst = subprocess.Popen([spellCmd, '-a'], close_fds=True,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
stdin=subprocess.PIPE)
|
||||
except OSError, e:
|
||||
irc.error(e, Raise=True)
|
||||
ret = inst.poll()
|
||||
if ret is not None:
|
||||
s = inst.stderr.readline()
|
||||
if not s:
|
||||
s = inst.stdout.readline()
|
||||
s = s.rstrip('\r\n')
|
||||
s = s.lstrip('Error: ')
|
||||
irc.error(s, Raise=True)
|
||||
(out, err) = inst.communicate(word)
|
||||
inst.wait()
|
||||
lines = filter(None, out.splitlines())
|
||||
lines.pop(0) # Banner
|
||||
if not lines:
|
||||
irc.error('No results found.', Raise=True)
|
||||
line = lines.pop(0)
|
||||
line2 = ''
|
||||
if lines:
|
||||
line2 = lines.pop(0)
|
||||
# parse the output
|
||||
# aspell will sometimes list spelling suggestions after a '*' or '+'
|
||||
# line for complex words.
|
||||
if line[0] in '*+' and line2.strip('\r\n'):
|
||||
if line[0] in '*+' and line2:
|
||||
line = line2
|
||||
if line[0] in '*+':
|
||||
resp = format('%q may be spelled correctly.', word)
|
||||
@ -199,24 +198,23 @@ class Unix(callbacks.Plugin):
|
||||
if self.registryValue('fortune.offensive'):
|
||||
args.append('-a')
|
||||
args.extend(self.registryValue('fortune.files'))
|
||||
inst = popen2.Popen4(args)
|
||||
(r, w) = (inst.fromchild, inst.tochild)
|
||||
try:
|
||||
lines = r.readlines()
|
||||
lines = map(str.rstrip, lines)
|
||||
lines = filter(None, lines)
|
||||
if lines:
|
||||
irc.replies(lines, joiner=' ')
|
||||
else:
|
||||
irc.error('It seems the configured fortune command was '
|
||||
'not available.')
|
||||
finally:
|
||||
w.close()
|
||||
r.close()
|
||||
inst.wait()
|
||||
inst = subprocess.Popen(args, close_fds=True,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
stdin=file(os.devnull))
|
||||
except OSError, e:
|
||||
irc.error('It seems the configured fortune command was '
|
||||
'not available.', Raise=True)
|
||||
(out, err) = inst.communicate()
|
||||
inst.wait()
|
||||
lines = out.splitlines()
|
||||
lines = map(str.rstrip, lines)
|
||||
lines = filter(None, lines)
|
||||
irc.replies(lines, joiner=' ')
|
||||
else:
|
||||
irc.error('I couldn\'t find the fortune command on this system. '
|
||||
'If it is installed on this system, reconfigure the '
|
||||
irc.error('The fortune command is not configured. If fortune is '
|
||||
'installed on this system, reconfigure the '
|
||||
'supybot.plugins.Unix.fortune.command configuration '
|
||||
'variable appropriately.')
|
||||
|
||||
@ -229,31 +227,27 @@ class Unix(callbacks.Plugin):
|
||||
"""
|
||||
wtfCmd = self.registryValue('wtf.command')
|
||||
if wtfCmd:
|
||||
def commandError():
|
||||
irc.error('It seems the configured wtf command '
|
||||
'was not available.')
|
||||
something = something.rstrip('?')
|
||||
inst = popen2.Popen4([wtfCmd, something])
|
||||
(r, w) = (inst.fromchild, inst.tochild)
|
||||
try:
|
||||
response = utils.str.normalizeWhitespace(r.readline().strip())
|
||||
if response:
|
||||
irc.reply(response)
|
||||
else:
|
||||
commandError()
|
||||
finally:
|
||||
r.close()
|
||||
w.close()
|
||||
inst.wait()
|
||||
inst = subprocess.Popen([wtfCmd, something], close_fds=True,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=file(os.devnull),
|
||||
stdin=file(os.devnull))
|
||||
except OSError:
|
||||
irc.error('It seems the configured wtf command was not '
|
||||
'available.', Raise=True)
|
||||
(out, _) = inst.communicate()
|
||||
inst.wait()
|
||||
if out:
|
||||
response = out.splitlines()[0].strip()
|
||||
response = utils.str.normalizeWhitespace(response)
|
||||
irc.reply(response)
|
||||
else:
|
||||
irc.error('I couldn\'t find the wtf command on this system. '
|
||||
'If it is installed on this system, reconfigure the '
|
||||
irc.error('The wtf command is not configured. If it is installed '
|
||||
'on this system, reconfigure the '
|
||||
'supybot.plugins.Unix.wtf.command configuration '
|
||||
'variable appropriately.')
|
||||
wtf = wrap(wtf, [optional(('literal', ['is'])), 'something'])
|
||||
|
||||
|
||||
Class = Unix
|
||||
|
||||
|
||||
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
###
|
||||
# Copyright (c) 2005, Jeremiah Fincher
|
||||
# Copyright (c) 2009, James Vega
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -59,8 +60,8 @@ if __name__ == '__main__':
|
||||
# import supybot.conf as conf
|
||||
import os
|
||||
import sys
|
||||
import popen2
|
||||
import optparse
|
||||
import subprocess
|
||||
|
||||
parser = optparse.OptionParser(usage='Usage: %prog [options]')
|
||||
parser.add_option('', '--verbose', action='store_true',
|
||||
@ -120,17 +121,18 @@ if __name__ == '__main__':
|
||||
sys.exit(-1)
|
||||
debug('Bot not found, starting.')
|
||||
home = os.environ['HOME']
|
||||
inst = popen2.Popen4('sh')
|
||||
inst = subprocess.Popen('sh', close_fds=True, stderr=subprocess.STDOUT,
|
||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
for filename in ('.login', '.bash_profile', '.profile', '.bashrc'):
|
||||
filename = os.path.join(home, filename)
|
||||
if os.path.exists(filename):
|
||||
debug('Found %s, sourcing.' % filename)
|
||||
inst.tochild.write('source %s' % filename + os.linesep)
|
||||
inst.communicate('source %s' % filename + os.linesep)
|
||||
cmdline = "%s --daemon %s" % (options.supybot, options.conffile)
|
||||
debug('Sending cmdline to sh process.')
|
||||
inst.tochild.write(cmdline + os.linesep)
|
||||
inst.tochild.close()
|
||||
debug('Received from sh process: %r' % inst.fromchild.read())
|
||||
(stdout, _) = inst.communicate(cmdline + os.linesep)
|
||||
inst.stdin.close()
|
||||
debug('Received from sh process: %r' % stdout)
|
||||
ret = inst.wait()
|
||||
debug('Bot started, command line %r returned %s.' % (cmdline, ret))
|
||||
sys.exit(ret)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user