From a78eb4a0c328c9ea5cce5ada7d4d7f424c330217 Mon Sep 17 00:00:00 2001 From: ochafik Date: Tue, 5 Mar 2024 03:25:43 +0000 Subject: [PATCH] json: fix _format_literal (json.dumps already escapes quotes) --- examples/json-schema-to-grammar.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/json-schema-to-grammar.py b/examples/json-schema-to-grammar.py index 457856641..31f8cd6ab 100755 --- a/examples/json-schema-to-grammar.py +++ b/examples/json-schema-to-grammar.py @@ -24,8 +24,8 @@ PRIMITIVE_RULES = { } INVALID_RULE_CHARS_RE = re.compile(r'[^a-zA-Z0-9-]+') -GRAMMAR_LITERAL_ESCAPE_RE = re.compile(r'[\r\n"]') -GRAMMAR_LITERAL_ESCAPES = {'\r': '\\r', '\n': '\\n', '"': '\\"'} +GRAMMAR_LITERAL_ESCAPE_RE = re.compile(r'[\r\n]') +GRAMMAR_LITERAL_ESCAPES = {'\r': '\\r', '\n': '\\n'} class SchemaConverter: @@ -36,7 +36,7 @@ class SchemaConverter: def _format_literal(self, literal): escaped = GRAMMAR_LITERAL_ESCAPE_RE.sub( - lambda m: GRAMMAR_LITERAL_ESCAPES.get(m.group(0)), json.dumps(literal) + lambda m: GRAMMAR_LITERAL_ESCAPES.get(m.group(0)), json.dumps(literal)[1:-1] ) return f'"{escaped}"'