Feedback

Author: Steve Ayers

protovalidate/config.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, Optional
+from typing import Optional
 
 
 @dataclass

protovalidate/internal/extra_func.py

@@ -15,6 +15,7 @@
 import math
 import re
 import typing
+from collections.abc import Callable
 from urllib import parse as urlparse
 
 import celpy
@@ -1555,7 +1556,7 @@ def __peek(self, char: str) -> bool:
         return self._index < len(self._string) and self._string[self._index] == char
 
 
-def get_matches_func(matcher: typing.Optional[typing.Callable[[str, str], bool]]):
+def get_matches_func(matcher: typing.Optional[Callable[[str, str], bool]]):
     if matcher is None:
         matcher = protovalidate_matches
 

protovalidate/internal/matches.py

@@ -48,7 +48,7 @@ def matches(text: str, pattern: str) -> bool:
     function via the Config.
 
     Raises:
-        celpy.CELEvalError: If pattern contains invalid re2 syntax.
+        celpy.CELEvalError: If pattern contains invalid re2 syntax or if an re.error is raised during matching.
     """
     # Simulate re2 by failing on any patterns not compatible with re2 syntax
     for invalid_pattern in invalid_patterns:

protovalidate/internal/rules.py

@@ -15,6 +15,7 @@
 import dataclasses
 import datetime
 import typing
+from collections.abc import Callable
 
 import celpy
 from celpy import celtypes
@@ -44,7 +45,7 @@ def unwrap(msg: message.Message) -> celtypes.Value:
     return field_to_cel(msg, msg.DESCRIPTOR.fields_by_name["value"])
 
 
-_MSG_TYPE_URL_TO_CTOR: dict[str, typing.Callable[..., celtypes.Value]] = {
+_MSG_TYPE_URL_TO_CTOR: dict[str, Callable[..., celtypes.Value]] = {
     "google.protobuf.Duration": make_duration,
     "google.protobuf.Timestamp": make_timestamp,
     "google.protobuf.StringValue": unwrap,