Browse files

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

  • Loading branch information...
2 parents 74bd82e + b79e007 commit 1e71768965dac3157f044d9c531239feafc5969a @JoeGermuska committed Jun 2, 2012
Showing with 11 additions and 5 deletions.
  1. +1 −0 AUTHORS
  2. +2 −1 csvkit/unicsv.py
  3. +5 −1 docs/scripts/in2csv.rst
  4. +2 −2 requirements.txt
  5. +1 −1 setup.py
View
1 AUTHORS
@@ -17,3 +17,4 @@ The following individuals have contributed code to csvkit:
* Anton Ian Sipos
* Gregory Temchenko
* Kevin Schaul
+* Marc Abramowitz
View
3 csvkit/unicsv.py
@@ -6,6 +6,7 @@
import codecs
import csv
+import fnmatch
from cStringIO import StringIO
from csvkit.exceptions import FieldSizeLimitError
@@ -40,7 +41,7 @@ def next(self):
row = self.reader.next()
except csv.Error, e:
# Terrible way to test for this exception, but there is no subclass
- if 'field larger than field limit' in str(e):
+ if fnmatch.fnmatch(str(e), 'field large[rt] than field limit *'):
raise FieldSizeLimitError(csv.field_size_limit())
else:
raise e
View
6 docs/scripts/in2csv.rst
@@ -31,7 +31,7 @@ The header line is required though the columns may be in any order::
-f FORMAT, --format FORMAT
The format of the input file. If not specified will be
inferred from the filename. Supported formats: csv,
- fixed, json, xls, xlsx.
+ dbf, fixed, json, xls, xlsx.
-s SCHEMA, --schema SCHEMA
Specifies a CSV-formatted schema file for converting
fixed-width files. See documentation for details.
@@ -68,3 +68,7 @@ Fetch csvkit's open issues from the Github API, convert the JSON response into a
$ curl http://github.com/api/v2/json/issues/list/onyxfish/csvkit/open | in2csv -v -k issues > issues.csv
+Convert a DBase DBF file to an equivalent CSV::
+
+ $ in2csv examples/testdbf.dbf > testdbf_converted.csv
+
View
4 requirements.txt
@@ -1,10 +1,10 @@
argparse==1.2.1
-nose==1.0.0
+nose==1.1.2
xlrd==0.7.1
python-dateutil==1.5
sqlalchemy==0.6.6
sphinx==1.0.7
coverage==3.5.1b1
openpyxl==1.5.7
tox==1.3
-dbf==0.90.004
+dbf==0.93.000
View
2 setup.py
@@ -50,5 +50,5 @@
'python-dateutil==1.5',
'sqlalchemy==0.6.6',
'openpyxl==1.5.7',
- 'dbf==0.90.004']
+ 'dbf==0.93.000']
)

0 comments on commit 1e71768

Please sign in to comment.