From 4054792be014a9b7373a5b909f5052ab271c2307 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Fri, 28 Mar 2008 14:13:49 -0400 Subject: Changing func/func/overlord/client.py:Client() to Overlord(). Client() still works but will dive a deprecation warning. First pass at this refactor. I think just about everything has been updated, but some questions remain. Like if client.py needs a name change. --- funcweb/funcweb/controllers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'funcweb') diff --git a/funcweb/funcweb/controllers.py b/funcweb/funcweb/controllers.py index eb2327f..b45d81b 100644 --- a/funcweb/funcweb/controllers.py +++ b/funcweb/funcweb/controllers.py @@ -2,7 +2,7 @@ import logging log = logging.getLogger(__name__) from turbogears import controllers, expose, flash, identity, redirect -from func.overlord.client import Client, Minions +from func.overlord.client import Overlord, Minions class Root(controllers.RootController): @@ -24,7 +24,7 @@ class Root(controllers.RootController): methods. If a method is supplied, it will display a method execution form. """ - fc = Client(name) + fc = Overlord(name) if not module: # list all modules modules = fc.system.list_modules() return dict(modules=modules) @@ -41,7 +41,7 @@ class Root(controllers.RootController): @expose(template="funcweb.templates.run") @identity.require(identity.not_anonymous()) def run(self, minion="*", module=None, method=None, arguments=''): - fc = Client(minion) + fc = Overlord(minion) results = getattr(getattr(fc, module), method)(*arguments.split()) cmd = "%s.%s.%s(%s)" % (minion, module, method, arguments) return dict(cmd=cmd, results=results) -- cgit