Revert change that made for ExpressionError #125

 - Update the try/except clause instead of modifying the ExpressionError class.

Signed-off-by: Chin Yeung Li <tli@nexb.com>

Author: chinyeungli

src/license_expression/__init__.py

@@ -87,9 +87,7 @@
 
 
 class ExpressionError(Exception):
-    def __init__(self, message, token_string=None):
-        super().__init__(message)
-        self.token_string = token_string
+    pass
 
 
 class ExpressionParseError(ParseError, ExpressionError):
@@ -787,10 +785,14 @@ def validate(self, expression, strict=True, **kwargs):
         # Check `expression` type and syntax
         try:
             parsed_expression = self.parse(expression, strict=strict)
-        except ExpressionError as e:
+        except ExpressionParseError as e:
             expression_info.errors.append(str(e))
             expression_info.invalid_symbols.append(e.token_string)
             return expression_info
+        except ExpressionError as e:
+            expression_info.errors.append(str(e))
+            expression_info.invalid_symbols.append(str(expression))
+            return expression_info
 
         # Check `expression` keys (validate)
         try:
@@ -1212,8 +1214,7 @@ def __init__(
             raise ExpressionError(
                 "Invalid license key: the valid characters are: letters and "
                 "numbers, underscore, dot, colon or hyphen signs and "
-                f"spaces: {key!r}",
-                token_string=f"{key!r}",
+                f"spaces: {key!r}"
             )
 
         # normalize spaces
@@ -1222,8 +1223,7 @@ def __init__(
         if key.lower() in KEYWORDS_STRINGS:
             raise ExpressionError(
                 'Invalid license key: a key cannot be a reserved keyword: "or",'
-                f' "and" or "with": {key!r}',
-                token_string=f"{key!r}",
+                f' "and" or "with": {key!r}'
             )
 
         self.key = key

tests/test_license_expression.py

@@ -2429,7 +2429,7 @@ def test_validation_invalid_license_key_chara(self):
         assert result.errors == [
             "Invalid license key: the valid characters are: letters and numbers, underscore, dot, colon or hyphen signs and spaces: 'cool,license'"
         ]
-        assert result.invalid_symbols == ["'cool,license'"]
+        assert result.invalid_symbols == ["cool,license"]
 
     def test_validate_exception(self):
         result = self.licensing.validate("GPL-2.0-or-later WITH WxWindows-exception-3.1")