Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 528d13f51529b213dd6e85fc215f83cc183bfe2e 2 parents 3e9005b + 4e5dd8c
@onyxfish authored
View
BIN  examples/test.xlsx
Binary file not shown
View
20 requirements.txt
@@ -1,10 +1,10 @@
-argparse==1.2.1
-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.94.003
+argparse>=1.2.1
+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.94.003
View
12 setup.py
@@ -48,10 +48,10 @@
]
},
install_requires = [
- 'argparse==1.2.1',
- 'xlrd==0.7.1',
- 'python-dateutil==1.5',
- 'sqlalchemy==0.6.6',
- 'openpyxl==1.5.7',
- 'dbf==0.94.003']
+ 'argparse>=1.2.1',
+ 'xlrd>=0.7.1',
+ 'python-dateutil>=1.5',
+ 'sqlalchemy>=0.6.6',
+ 'openpyxl>=1.5.7',
+ 'dbf>=0.94.003']
)
View
2  tests/test_convert/test_convert.py
@@ -4,7 +4,7 @@
class TestConvert(unittest.TestCase):
def test_valid_file(self):
- with open('examples/test.xls', 'r') as f:
+ with open('examples/test.xls', 'rb') as f:
output = convert.convert(f, 'xls')
with open('examples/testxls_converted.csv', 'r') as f:
View
2  tests/test_convert/test_xls.py
@@ -80,7 +80,7 @@ def test_determine_column_type_empty(self):
self.assertEquals(column_type, xlrd.biffh.XL_CELL_EMPTY)
def test_xls(self):
- with open('examples/test.xls', 'r') as f:
+ with open('examples/test.xls', 'rb') as f:
output = xls.xls2csv(f)
with open('examples/testxls_converted.csv', 'r') as f:
View
3  tests/test_unicsv.py
@@ -153,12 +153,11 @@ def setUp(self):
with open('dummy.csv', 'w') as f:
f.write('a' * 10)
- f.close()
def tearDown(self):
# Resetting limit to avoid failure in other tests.
csv.field_size_limit(self.lim)
- os.system('rm dummy.csv')
+ os.remove('dummy.csv')
def test_maxfieldsize(self):
# Testing --maxfieldsize for failure. Creating data using str * int.
Please sign in to comment.
Something went wrong with that request. Please try again.