Skip to content
Snippets Groups Projects
Commit 289f60fe authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'f-xlsimporter-error' into 'dev'

f xlsimporter error

Closes #52

See merge request !16
parents 99c979d9 4358393c
No related branches found
No related tags found
2 merge requests!22Release 0.3,!16f xlsimporter error
Pipeline #14367 passed with warnings
...@@ -182,7 +182,7 @@ class XLSImporter(object): ...@@ -182,7 +182,7 @@ class XLSImporter(object):
""" """
try: try:
xls_file = pd.io.excel.ExcelFile(filename) xls_file = pd.io.excel.ExcelFile(filename)
except XLRDError as e: except (XLRDError, ValueError) as e:
logger.warning( logger.warning(
"Cannot read \n{}.\nError:{}".format(filename, "Cannot read \n{}.\nError:{}".format(filename,
str(e)), str(e)),
......
...@@ -164,7 +164,6 @@ class XLSImporterTest(unittest.TestCase): ...@@ -164,7 +164,6 @@ class XLSImporterTest(unittest.TestCase):
df_new = self.importer.check_unique(df) df_new = self.importer.check_unique(df)
self.assertEqual(df_new.shape[0], 1) self.assertEqual(df_new.shape[0], 1)
@pytest.mark.xfail(reason="Wrong Error is raised. See Issue #52")
def test_raise(self): def test_raise(self):
tmp = NamedTemporaryFile(delete=False, suffix=".lol") tmp = NamedTemporaryFile(delete=False, suffix=".lol")
tmp.close() tmp.close()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment