Merge branch 'dev' into f-tsv-importer

unittests/test_table_importer.py

@@ -67,6 +67,7 @@ class ConverterTest(unittest.TestCase):
             r"\this\computer,\this\computer"),
                          ["/this/computer", "/this/computer"])
 
+    @pytest.mark.xfail(reason="To be fixed, see Issue #34")
     def test_datetime(self):
         test_file = os.path.join(os.path.dirname(__file__), "date.xlsx")
         self.importer = XLSImporter(converters={'d': datetime_converter,
@@ -172,6 +173,5 @@ class XLSImporterTest(TableImporterTest):
     def test_raise(self):
         tmp = NamedTemporaryFile(delete=False, suffix=".lol")
         tmp.close()
-        # TODO ValueError is raised instead
         self.assertRaises(DataInconsistencyError, self.importer.read_xls,
                           tmp.name)