From ce9d41bb5ee83e7cf6322aec52a33987e1997b5f Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Mon, 30 Jul 2018 18:52:08 +0200 Subject: [PATCH] Revert "allow # in IDs" This reverts commit 1310c0c63d3db1ff3eea36501f7d68958eae5f8b. --- jsonpath_rw/lexer.py | 2 +- tests/test_lexer.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jsonpath_rw/lexer.py b/jsonpath_rw/lexer.py index b85b425..aa28ff5 100644 --- a/jsonpath_rw/lexer.py +++ b/jsonpath_rw/lexer.py @@ -61,7 +61,7 @@ def tokenize(self, string): t_ignore = ' \t' def t_ID(self, t): - r'[a-zA-Z_@#][a-zA-Z0-9_@\-]*' + r'[a-zA-Z_@][a-zA-Z0-9_@\-]*' t.type = self.reserved_words.get(t.value, 'ID') return t diff --git a/tests/test_lexer.py b/tests/test_lexer.py index 481215d..9d9fe38 100644 --- a/tests/test_lexer.py +++ b/tests/test_lexer.py @@ -53,7 +53,6 @@ def test_simple_inputs(self): self.assert_lex_equiv('`this`', [self.token('this', 'NAMED_OPERATOR')]) self.assert_lex_equiv('|', [self.token('|', '|')]) self.assert_lex_equiv('where', [self.token('where', 'WHERE')]) - self.assert_lex_equiv('a.#text', [self.token('a', 'ID'), self.token('.', '.'), self.token('#text', 'ID')]) def test_basic_errors(self): def tokenize(s): @@ -67,4 +66,4 @@ def tokenize(s): self.assertRaises(JsonPathLexerError, tokenize, '"`') self.assertRaises(JsonPathLexerError, tokenize, "'`") self.assertRaises(JsonPathLexerError, tokenize, '?') - self.assertRaises(JsonPathLexerError, tokenize, '$.foo.bar.%') + self.assertRaises(JsonPathLexerError, tokenize, '$.foo.bar.#')