From ac377b4f58b7cadc87c2e515708e36d6f0f18b37 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Tue, 12 Mar 2013 23:11:46 +0000 Subject: [PATCH] service.py: Yet more unqualified names needing qualification. Organization: Straylight/Edgeware From: Mark Wooding Maybe this is the last batch. --- service.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/service.py b/service.py index 5153539..0944e2c 100644 --- a/service.py +++ b/service.py @@ -31,6 +31,7 @@ import subprocess as SUB from auto import HOME import backend as B +import cgi as CGI import config as CONF; CFG = CONF.CFG import hash as H import util as U @@ -204,7 +205,7 @@ class BasicRemoteService (BasicService): """ ## Run the command and collect its output and status. - with timeout(30, "waiting for remote service %s" % me._describe()): + with U.timeout(30, "waiting for remote service %s" % me._describe()): proc = SUB.Popen(me._mkcmd(cmd), stdin = input is not None and SUB.PIPE or None, stdout = SUB.PIPE, stderr = SUB.PIPE) @@ -289,7 +290,7 @@ class SSHRemoteService (BasicRemoteService): def _mkcmd(me, cmd): """Format a command for SSH. Mainly escaping arguments.""" - return ['ssh', me._remote, ' '.join(map(urlencode, cmd))] + return ['ssh', me._remote, ' '.join(map(CGI.urlencode, cmd))] def setpasswd(me, user, passwd): """Service protocol: set the USER's password to PASSWD.""" -- [mdw]