Revision 16be8703 lib/cli.py

b/lib/cli.py
37 37
                      Option, OptionValueError, SUPPRESS_HELP)
38 38

  
39 39
__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain", "SubmitOpCode",
40
           "cli_option", "OutputTable",
40
           "cli_option", "GenerateTable",
41 41
           "ARGS_NONE", "ARGS_FIXED", "ARGS_ATLEAST", "ARGS_ANY", "ARGS_ONE",
42 42
           "USEUNITS_OPT", "FIELDS_OPT", "FORCE_OPT"]
43 43

  
......
280 280
  return result
281 281

  
282 282

  
283
def OutputTable(headers, fields, separator, data,
284
                numfields=None, unitfields=None):
283
def GenerateTable(headers, fields, separator, data,
284
                  numfields=None, unitfields=None):
285 285
  """Prints a table with headers and different fields.
286 286

  
287 287
  Args:
......
325 325
      if separator is None:
326 326
        mlens[idx] = max(mlens[idx], len(val))
327 327

  
328
  result = []
328 329
  if headers:
329 330
    args = []
330 331
    for idx, name in enumerate(fields):
......
333 334
        mlens[idx] = max(mlens[idx], len(hdr))
334 335
        args.append(mlens[idx])
335 336
      args.append(hdr)
336
    logger.ToStdout(format % tuple(args))
337
    result.append(format % tuple(args))
337 338

  
338 339
  for line in data:
339 340
    args = []
......
341 342
      if separator is None:
342 343
        args.append(mlens[idx])
343 344
      args.append(line[idx])
344
    logger.ToStdout(format % tuple(args))
345
    result.append(format % tuple(args))
346

  
347
  return result

Also available in: Unified diff