X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=controller.py;h=0732ee59bd57e2da998373e65b4505da10c24d43;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hp=2f2bc0cc31f644f203b53cc30b6365aef843fb4f;hpb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;p=nodemanager.git

diff --git a/controller.py b/controller.py
index 2f2bc0c..0732ee5 100644
--- a/controller.py
+++ b/controller.py
@@ -1,15 +1,15 @@
-# $Id$
-# $URL$
+#
+"""Delegate accounts are used to provide secure access to the XMLRPC API.
+They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
 
-"""Delegate accounts are used to provide secure access to the XMLRPC API.  They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
+from pwd import getpwnam
+from grp import getgrnam
 
-import accounts
 import logger
 import tools
-from pwd import getpwnam
-from grp import getgrnam
+import account
 
-class Controller(accounts.Account):
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
     TYPE = 'controller.Controller'
 
@@ -17,15 +17,15 @@ class Controller(accounts.Account):
     def create(name, vref = None):
         add_shell(Controller.SHELL)
         group = getgrnam("slices")[2]
-        logger.log_call('/usr/sbin/useradd', '-p', '*', '-g', str(group), '-s', Controller.SHELL, name)
+        logger.log_call(['/usr/sbin/useradd', '-p', '*', '-g', str(group), '-s', Controller.SHELL, name, ])
 
     @staticmethod
-    def destroy(name): logger.log_call('/usr/sbin/userdel', '-r', name)
+    def destroy(name): logger.log_call(['/usr/sbin/userdel', '-r', name, ])
 
     def is_running(self):
         logger.verbose("controller: is_running:  %s" % self.name)
         return getpwnam(self.name)[6] == self.SHELL
-    
+
 
 def add_shell(shell):
     """Add <shell> to /etc/shells if it's not already there."""
@@ -34,5 +34,5 @@ def add_shell(shell):
     etc_shells.close()
     if shell not in valid_shells:
         etc_shells = open('/etc/shells', 'a')
-        print >>etc_shells, shell
+        print(shell, file=etc_shells)
         etc_shells.close()