Mercurial > hg > numerics
diff numerics/read.py @ 133:8b120c7f0cf9
lets call it a night
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Mon, 16 Mar 2015 21:53:31 -0700 |
parents | 7578313b9fbf |
children |
line wrap: on
line diff
--- a/numerics/read.py Mon Mar 16 21:39:00 2015 -0700 +++ b/numerics/read.py Mon Mar 16 21:53:31 2015 -0700 @@ -95,8 +95,8 @@ kwargs.setdefault('description', __doc__) kwargs.setdefault('formatter_class', argparse.RawTextHelpFormatter) argparse.ArgumentParser.__init__(self, **kwargs) - self.add_argument('csv', nargs='*', - help="CSV files to read, or read from stdin") + self.add_argument('input', nargs='*', + help="CSV input files to read, or read from stdin") self.add_argument('-+', '--add', dest='added_columns', nargs='+', help="append this column") self.add_argument('-c', '--col', '--columns', dest='columns', @@ -118,14 +118,12 @@ def validate(self, options): """validate options""" - - if not options.csv: - options.csv = [sys.stdin] + options.input = options.input or [sys.stdin] def read(self): """read and process CSV""" - data = read_csv(*self.options.csv) + data = read_csv(*self.options.input) if self.options.added_columns: # add columns @@ -164,10 +162,6 @@ help="transpose columns and rows") options = parser.parse_args(args) - if not options.csv: - # read from stdin - options.csv = [sys.stdin] - # read CSV if options.transpose: data = parser.columns()