summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipalib/cli.py7
-rw-r--r--ipalib/frontend.py1
2 files changed, 4 insertions, 4 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 92c0cbc3..a76c08bc 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -57,7 +57,7 @@ class help(frontend.Application):
takes_args = ['command']
- def __call__(self, key):
+ def run(self, key):
key = str(key)
if key not in self.application:
print 'help: no such command %r' % key
@@ -70,16 +70,17 @@ class help(frontend.Application):
class console(frontend.Application):
'Start the IPA interactive Python console.'
- def __call__(self):
+ def run(self):
code.interact(
'(Custom IPA interactive Python console)',
local=dict(api=self.api)
)
+
class show_plugins(frontend.Application):
'Print details on the loaded plugins.'
- def __call__(self):
+ def run(self):
lines = self.__traverse()
ml = max(len(l[1]) for l in lines)
for line in lines:
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index 11d05d5f..dbc3a62d 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -245,7 +245,6 @@ class Command(plugable.Plugin):
'validate',
'execute',
'__call__',
- 'smart_option_order',
'args',
'options',
'params',