diff options
author | Doug Hellmann <doug.hellmann@dreamhost.com> | 2012-06-18 18:13:59 -0400 |
---|---|---|
committer | Doug Hellmann <doug.hellmann@dreamhost.com> | 2012-06-18 18:13:59 -0400 |
commit | 9bb0a4a13acfce6a0924514b883417875a1143dc (patch) | |
tree | fa63700c7a47489a7aa18f8aef7289773a675cc3 /cliff/lister.py | |
parent | a7987bc9d562341967305b20a174658dc556ce20 (diff) | |
parent | 1473b678ce4219f5119ae9e98af0fa5d7e21992d (diff) | |
download | cliff-tablib-9bb0a4a13acfce6a0924514b883417875a1143dc.tar.gz |
merge API refactoring work
Diffstat (limited to 'cliff/lister.py')
-rw-r--r-- | cliff/lister.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cliff/lister.py b/cliff/lister.py index bef2d17..406be97 100644 --- a/cliff/lister.py +++ b/cliff/lister.py @@ -24,13 +24,12 @@ class Lister(DisplayCommandBase): return 'table' @abc.abstractmethod - def get_data(self, parsed_args): + def take_action(self, parsed_args): """Return a tuple containing the column names and an iterable containing the data to be listed. """ - def run(self, parsed_args): - column_names, data = self.get_data(parsed_args) + def produce_output(self, parsed_args, column_names, data): if not parsed_args.columns: columns_to_include = column_names data_gen = data @@ -50,10 +49,9 @@ class Lister(DisplayCommandBase): # list so the table formatter can ask for its length. data_gen = (list(itertools.compress(row, selector)) for row in data) - formatter = self.formatters[parsed_args.formatter] - formatter.emit_list(columns_to_include, - data_gen, - self.app.stdout, - parsed_args, - ) + self.formatter.emit_list(columns_to_include, + data_gen, + self.app.stdout, + parsed_args, + ) return 0 |