From 0b4ddcd1cc5b5463a9591dc0a2de8e6b40549a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 15 Jul 2020 08:47:30 +0200
Subject: [PATCH] FIX: treat filename=None correctly
---
src/caosadvancedtools/table_importer.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/caosadvancedtools/table_importer.py b/src/caosadvancedtools/table_importer.py
index 3b67e932..3e0e8991 100755
--- a/src/caosadvancedtools/table_importer.py
+++ b/src/caosadvancedtools/table_importer.py
@@ -73,10 +73,9 @@ class XLS_Importer(object):
try:
xls_file = pd.io.excel.ExcelFile(filename)
except XLRDError as e:
- errmsg = ("Cannot read {}.".format(filename) if "\n"+filename+"\n"
- else "the file.")
logger.warning(
- errmsg,
+ "Cannot read \n{}.\nError:{}".format(filename,
+ str(e)),
extra={'identifier': str(filename),
'category': "inconsistency"})
raise DataInconsistencyError(*e.args)
@@ -91,10 +90,8 @@ class XLS_Importer(object):
try:
df = xls_file.parse(converters=self.converters)
except Exception as e:
- errmsg = ("Cannot parse {}.".format(filename) if "\n"+filename+"\n"
- else "the file.")
logger.warning(
- errmsg,
+ "Cannot parse {}.".format(filename),
extra={'identifier': str(filename),
'category': "inconsistency"})
raise DataInconsistencyError(*e.args)
@@ -111,7 +108,7 @@ class XLS_Importer(object):
for col in self.required_columns:
if col not in df.columns:
errmsg = "Column '{}' missing in ".format(col)
- errmsg += ("{}.".format(filename) if "\n"+filename+"\n"
+ errmsg += ("\n{}.\n".format(filename) if filename
else "the file.")
errmsg += "Stopping to treat this file..."
logger.warning(
--
GitLab