X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=controller.py;h=0732ee59bd57e2da998373e65b4505da10c24d43;hp=ab8e52175651dd3baee52c0bec42bec94d38dd35;hb=HEAD;hpb=164e7fc96baccd6ae5caa57b794fb9966167eca2

diff --git a/controller.py b/controller.py
index ab8e521..0732ee5 100644
--- a/controller.py
+++ b/controller.py
@@ -1,16 +1,15 @@
-# $Id$
-# $URL$
-
-"""Delegate accounts are used to provide secure access to the XMLRPC API.  
+#
+"""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."""
 
-import accounts
-import logger
-import tools
 from pwd import getpwnam
 from grp import getgrnam
 
-class Controller(accounts.Account):
+import logger
+import tools
+import account
+
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
     TYPE = 'controller.Controller'
 
@@ -26,7 +25,7 @@ class Controller(accounts.Account):
     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."""
@@ -35,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()