reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / controller.py

diff --git a/controller.py b/controller.py
index 826ca49..0732ee5 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -1,6 +1,4 @@
-# $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."""
 
@@ -9,9 +7,9 @@ from grp import getgrnam
 
 import logger
 import tools
-import accounts
+import account
 
-class Controller(accounts.Account):
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
     TYPE = 'controller.Controller'
 
@@ -36,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()