jeremydw
diff --git a/‎jsonpath_rw/lexer.py
Lines changed: 8 additions & 5 deletions b/‎jsonpath_rw/lexer.py
Lines changed: 8 additions & 5 deletions
diff --git a/‎tests/test_lexer.py
Lines changed: 10 additions & 1 deletion b/‎tests/test_lexer.py
Lines changed: 10 additions & 1 deletion
@@ -6,6 +6,9 @@
 
 logger = logging.getLogger(__name__)
 
+class JsonPathLexerError(Exception):
+    pass
+
 class JsonPathLexer(object):
     '''
     A Lexical analyzer for JsonPath. 
@@ -14,7 +17,7 @@ class JsonPathLexer(object):
     def __init__(self, debug=False):
         self.debug = debug
         if self.__doc__ == None:
-            raise Exception('Docstrings have been removed! By design of PLY, jsonpath-rw requires docstrings. You must not use PYTHONOPTIMIZE=2 or python -OO.')
+            raise JsonPathLexerError('Docstrings have been removed! By design of PLY, jsonpath-rw requires docstrings. You must not use PYTHONOPTIMIZE=2 or python -OO.')
 
     def tokenize(self, string):
         '''
@@ -78,7 +81,7 @@ def t_singlequote_SINGLEQUOTE(self, t):
         return t
 
     def t_singlequote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing singlequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
+        raise JsonPathLexerError('Error on line %s, col %s while lexing singlequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 
     # Double-quoted strings
@@ -96,7 +99,7 @@ def t_doublequote_DOUBLEQUOTE(self, t):
         return t
 
     def t_doublequote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing doublequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
+        raise JsonPathLexerError('Error on line %s, col %s while lexing doublequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 
     # Back-quoted "magic" operators
@@ -114,7 +117,7 @@ def t_backquote_BACKQUOTE(self, t):
         return t
 
     def t_backquote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing backquoted operator: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
+        raise JsonPathLexerError('Error on line %s, col %s while lexing backquoted operator: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 
     # Counting lines, handling errors
@@ -124,7 +127,7 @@ def t_newline(self, t):
         t.lexer.latest_newline = t.lexpos
 
     def t_error(self, t):
-        raise Exception('Error on line %s, col %s: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
+        raise JsonPathLexerError('Error on line %s, col %s: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 if __name__ == '__main__':
     logging.basicConfig()
 
@@ -4,7 +4,7 @@
 
 from ply.lex import LexToken
 
-from jsonpath_rw.lexer import JsonPathLexer
+from jsonpath_rw.lexer import JsonPathLexer, JsonPathLexerError
 
 class TestLexer(unittest.TestCase):
 
@@ -47,3 +47,12 @@ 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')])
+
+    def test_basic_errors(self):
+        def tokenize(s):
+            l = JsonPathLexer(debug=True)
+            return list(l.tokenize(s))
+        self.assertRaises(JsonPathLexerError, tokenize, "'\"")
+        self.assertRaises(JsonPathLexerError, tokenize, '"\'')
+        self.assertRaises(JsonPathLexerError, tokenize, '?')
+        self.assertRaises(JsonPathLexerError, tokenize, '$.foo.bar.#')