From 533688029233d49e4bf19b618195f86f55ed3221 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Mon, 8 Jun 2015 14:17:18 +0200 Subject: De-engineer _warn_or_undef_assign(). Overly general. Turn it into _stderr_msg(). --- kconfiglib.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index 79239d8..00c12a3 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -1780,28 +1780,19 @@ error, and you should email ulfalizer a.t Google's email service.""" def _warn(self, msg, filename = None, linenr = None): """For printing warnings to stderr.""" if self.print_warnings: - _warn_or_undef_assign(msg, WARNING, filename, linenr) + _stderr_msg("warning: " + msg, filename, linenr) def _undef_assign(self, msg, filename = None, linenr = None): """For printing informational messages related to assignments to undefined variables to stderr.""" if self.print_undef_assign: - _warn_or_undef_assign(msg, UNDEF_ASSIGN, filename, linenr) + _stderr_msg("info: " + msg, filename, linenr) -def _warn_or_undef_assign(msg, msg_type, filename, linenr): +def _stderr_msg(msg, filename, linenr): if filename is not None: sys.stderr.write("{0}:".format(_clean_up_path(filename))) if linenr is not None: sys.stderr.write("{0}:".format(linenr)) - - if msg_type == WARNING: - sys.stderr.write("warning: ") - elif msg_type == UNDEF_ASSIGN: - sys.stderr.write("info: ") - else: - _internal_error('Internal error while printing warning: unknown warning type "{0}".' - .format(msg_type)) - sys.stderr.write(msg + "\n") def _get_expr_syms(expr): @@ -2001,9 +1992,6 @@ tri_to_int = { "n" : 0, "m" : 1, "y" : 2 } op_to_str = { AND : " && ", OR : " || ", EQUAL : " = ", UNEQUAL : " != " } precedence = { OR : 0, AND : 1, NOT : 2 } -# Types of informational messages -WARNING, UNDEF_ASSIGN = 0, 1 - def _intersperse(lst, op): """_expr_to_str() helper. Gets the string representation of each expression in lst and produces a list where op has been inserted between the elements.""" -- cgit v1.2.3