Merge branch 'master' of https://github.com/onyxfish/csvkit

csvkit/cli.py

@@ -225,14 +225,16 @@ def parse_column_identifiers(ids, column_names):
 
     for c in ids.split(','):
         c = c.strip()
+
         try:
             columns.append(match_column_identifier(column_names, c))
         except ColumnIdentifierError:
             if ':' in c:
                 a,b = c.split(':',1)
             elif '-' in c:
                 a,b = c.split('-',1)
-            else: raise
+            else:
+                raise
 
             try:
                 if a:

csvkit/utilities/in2csv.py

@@ -35,7 +35,7 @@ def main(self):
         elif self.args.key:
             format = 'json'
         else:
-            if self.args.file == '<stdin>':
+            if self.args.file == sys.stdin:
                 self.argparser.error('You must specify a format when providing data via STDIN (pipe).')
 
             format = convert.guess_format(self.args.file)

tests/test_utilities/test_in2csv.py

@@ -1,9 +1,17 @@
 #!/usr/bin/env python
 
 import unittest
+import StringIO
 
 from csvkit.utilities.in2csv import In2CSV
 
 class TestIn2CSV(unittest.TestCase):
-    pass
-
+    def test_convert_xls(self):
+        args = ['-f', 'xls', 'examples/test.xls']
+        output_file = StringIO.StringIO()
+
+        utility = In2CSV(args, output_file)
+        utility.main()
+
+        target_output = open('examples/testxls_converted.csv', 'r').read()
+        self.assertEqual(output_file.getvalue(), target_output)