From 595b1be302ce4b503825dd31b485376bf9d908a0 Mon Sep 17 00:00:00 2001 From: benne238 Date: Wed, 30 Jun 2021 16:06:46 -0400 Subject: [PATCH] modified action end delimiter and modified the expected value error message when the parser encounters a malformed delimiter --- src/webqueue2api/parser/parser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webqueue2api/parser/parser.py b/src/webqueue2api/parser/parser.py index 24fe3bc..677d88f 100644 --- a/src/webqueue2api/parser/parser.py +++ b/src/webqueue2api/parser/parser.py @@ -16,7 +16,7 @@ # Delimiters ################################################################################ action_start_delimiter = "*** " -action_end_delimiter = " ***" +action_end_delimiter = "***" edit_start_delimiter = action_start_delimiter + "Edited by: " status_start_delimiter = action_start_delimiter + "Status updated by: " @@ -186,10 +186,10 @@ def error_handler(original_string, match_start_index, tokens): parsed_item.append(parse_error) raise ParseError(line_number, f"No reply from user end delimiter found") else: - expected_token = f"Action delimiter starting with {action_start_delimiter} or {reply_from_user_start_delimiter}" + expected_token = f"Action delimiter starting with '{action_start_delimiter}' and ending with '{action_end_delimiter}' or {reply_from_user_start_delimiter}" line_number = (original_string[:match_start_index]).count('\n') + 1 - parse_error["expected"] = f"Action start delimiter: '{action_start_delimiter}' or '{reply_from_user_start_delimiter}'" + parse_error["expected"] = expected_token parse_error["got"] = token_string parse_error["line_num"] = line_number parsed_item.append(parse_error)