Skip to content

Commit bbfe0bc

Browse files
committed
[tools/dict_parser] Add label to warning msg
1 parent 474f4ad commit bbfe0bc

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

odml/tools/dict_parser.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
from ..info import FORMAT_VERSION
99
from .parser_utils import InvalidVersionException, ParserException, odml_tuple_export
1010

11+
LABEL_ERROR = "Error"
12+
LABEL_WARNING = "Warning"
13+
1114

1215
def parse_cardinality(vals):
1316
"""
@@ -203,7 +206,7 @@ def is_valid_attribute(self, attr, fmt):
203206
if fmt.revmap(attr):
204207
return attr
205208

206-
msg = "Invalid element |%s| inside <%s> tag" % (attr, fmt.__class__.__name__)
209+
msg = "Invalid element '%s' inside <%s> tag" % (attr, fmt.__class__.__name__)
207210
self.error(msg)
208211

209212
return None
@@ -217,19 +220,20 @@ def error(self, msg):
217220
:param msg: Error message.
218221
"""
219222
if self.ignore_errors:
220-
return self.warn(msg)
223+
return self.warn(msg, LABEL_ERROR)
221224

222225
raise ParserException(msg)
223226

224-
def warn(self, msg):
227+
def warn(self, msg, label=LABEL_WARNING):
225228
"""
226229
Adds a message to the parsers warnings property. If the parsers show_warnings
227230
property is set to True, an additional error message will be written
228231
to sys.stderr.
229232
230233
:param msg: Warning message.
234+
:param label: Defined message level, can be 'Error' or 'Warning'. Default is 'Warning'.
231235
"""
232-
msg = "warning: %s\n" % msg
236+
msg = "%s: %s" % (label, msg)
233237

234238
self.warnings.append(msg)
235239

0 commit comments

Comments
 (0)