← Back to branch summary

~hudson-openstack/burrow/cactus

« back to all changes in this revision

Viewing changes to burrow/shell.py

  • Committer: Tarmac
  • Author(s): Eric Day
  • Date: 2011-04-22 02:22:27 UTC
  • mfrom: (7.1.5 dev)
  • Revision ID: tarmac-20110422022227-vp7jstq3xet2e7vh
Misc. bug fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
burrow/shell.py
20
20
import optparse
21
21
import os
22
22
import sys
 
23
import types
23
24
 
24
25
import burrow
25
26
 
195
196
            filters['marker'] = self.options.marker
196
197
        if self.options.all is not None:
197
198
            filters['match_hidden'] = self.options.all
 
199
        if self.options.detail is not None:
 
200
            filters['detail'] = self.options.detail
198
201
        return filters
199
202
 
200
203
    def _print_result(self, result):
201
204
        '''Format and print the result.'''
202
 
        if isinstance(result, list):
 
205
        if isinstance(result, list) or isinstance(result, types.GeneratorType):
203
206
            for item in result:
204
207
                if isinstance(item, dict):
205
208
                    self._print_message(item)