summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2012-06-18 18:06:32 -0400
committerDoug Hellmann <doug.hellmann@dreamhost.com>2012-06-18 18:06:32 -0400
commit1473b678ce4219f5119ae9e98af0fa5d7e21992d (patch)
tree619b4d88cee9f9605068037b55ddc05742d83e48
parent122fa558b8b7b99541ee1bca433ad87b1b3650ff (diff)
downloadcliff-tablib-1473b678ce4219f5119ae9e98af0fa5d7e21992d.tar.gz
fix help and tests for API change
-rw-r--r--cliff/help.py5
-rw-r--r--tests/test_command.py2
-rw-r--r--tests/test_help.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/cliff/help.py b/cliff/help.py
index 1e4793e..58c1ead 100644
--- a/cliff/help.py
+++ b/cliff/help.py
@@ -36,10 +36,11 @@ class HelpCommand(Command):
)
return parser
- def run(self, parsed_args):
+ def take_action(self, parsed_args):
if parsed_args.cmd:
try:
- cmd_factory, cmd_name, search_args = self.app.command_manager.find_command(parsed_args.cmd)
+ info = self.app.command_manager.find_command(parsed_args.cmd)
+ cmd_factory, cmd_name, search_args = info
except ValueError:
# Did not find an exact match
cmd = parsed_args.cmd[0]
diff --git a/tests/test_command.py b/tests/test_command.py
index 8b0d217..39fde51 100644
--- a/tests/test_command.py
+++ b/tests/test_command.py
@@ -6,7 +6,7 @@ class TestCommand(Command):
"""Description of command.
"""
- def run(self, parsed_args):
+ def take_action(self, parsed_args):
return
diff --git a/tests/test_help.py b/tests/test_help.py
index 8c7e7ed..6d67356 100644
--- a/tests/test_help.py
+++ b/tests/test_help.py
@@ -28,7 +28,7 @@ class TestCommand(Command):
# so parse_args() is called.
return TestParser()
- def run(self, args):
+ def take_action(self, args):
return