From 8f9c6c10c4ec1fffd48a255320f4cbbb67496033 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 8 Jul 2022 11:48:49 -0700 Subject: mparser: Don't create an exception to pass to mlog.warning Just call `mlog.code_line` directly, since the exception is never raised. --- mesonbuild/mparser.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mesonbuild/mparser.py') diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 98f530f..6bb08a7 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -193,11 +193,10 @@ class Lexer: elif tid in {'string', 'fstring'}: # Handle here and not on the regexp to give a better error message. if match_text.find("\n") != -1: - msg = ParseException("Newline character in a string detected, use ''' (three single quotes) " - "for multiline strings instead.\n" - "This will become a hard error in a future Meson release.", - self.getline(line_start), lineno, col) - mlog.warning(msg, location=BaseNode(lineno, col, filename)) + msg = ("Newline character in a string detected, use ''' (three single quotes) " + "for multiline strings instead.\n" + "This will become a hard error in a future Meson release.") + mlog.warning(mlog.code_line(msg, self.getline(line_start), col), location=BaseNode(lineno, col, filename)) value = match_text[2 if tid == 'fstring' else 1:-1] try: value = ESCAPE_SEQUENCE_SINGLE_RE.sub(decode_match, value) -- cgit v1.1