diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-02-20 21:56:47 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-02-20 21:56:47 +0000 |
| commit | abc364013de96b1ff0170b65665388ed8ca3e07f (patch) | |
| tree | 04e1b5c369edc905fea4e785cbbadc207a670571 /src/lib/Server/Plugins/SSHbase.py | |
| parent | 202a3aec707802a85bbf5bfbf82e86a0317c2bbb (diff) | |
| download | bcfg2-abc364013de96b1ff0170b65665388ed8ca3e07f.tar.gz bcfg2-abc364013de96b1ff0170b65665388ed8ca3e07f.tar.bz2 bcfg2-abc364013de96b1ff0170b65665388ed8ca3e07f.zip | |
os.popen is deprecated in 2.6 (http://docs.python.org/library/os.html#os.popen)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5088 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/SSHbase.py')
| -rw-r--r-- | src/lib/Server/Plugins/SSHbase.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index 4ca2fdf51..1485df626 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -1,7 +1,11 @@ '''This module manages ssh key files for bcfg2''' __revision__ = '$Revision$' -import binascii, os, socket, tempfile +import binascii +import os +import socket +import tempfile +from subprocess import Popen, PIPE import Bcfg2.Server.Plugin class SSHbase(Bcfg2.Server.Plugin.Plugin, @@ -128,7 +132,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, return (ipaddr, client) except socket.gaierror: cmd = "getent hosts %s" % client - ipaddr = os.popen(cmd).read().strip().split() + ipaddr = Popen(cmd, shell=True, stdout=PIPE).stdout.read().strip().split() if ipaddr: self.ipcache[client] = (ipaddr, client) return (ipaddr, client) |