Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: catch re.error in re.Pattern compilation to raise ValidationError instead #597

Merged
merged 2 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions apischema/std_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from typing import Deque, List, TypeVar
from uuid import UUID

from apischema import deserializer, schema, serializer, type_name
from apischema import ValidationError, deserializer, schema, serializer, type_name
from apischema.conversions import Conversion, as_str, catch_value_error

T = TypeVar("T")
Expand Down Expand Up @@ -88,10 +88,17 @@ def to_base64(b: bytes) -> str:

# =================== pattern ===================

Pattern = type(re.compile(r""))
deserializer(Conversion(catch_value_error(re.compile), source=str, target=Pattern))
serializer(Conversion(operator.attrgetter("pattern"), source=Pattern, target=str))
type_name(None)(Pattern)

@deserializer
def _compile(pattern: str) -> re.Pattern:
try:
return re.compile(pattern)
except re.error as err:
raise ValidationError(str(err))


serializer(Conversion(operator.attrgetter("pattern"), source=re.Pattern, target=str))
type_name(None)(re.Pattern)

# ==================== uuid =====================

Expand Down
16 changes: 16 additions & 0 deletions tests/integration/test_pattern_deserialization.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import re

import pytest

from apischema import ValidationError, deserialize


def test_valid_pattern():
pattern = deserialize(re.Pattern, "(a|b)")
assert isinstance(pattern, re.Pattern)
assert pattern.pattern == "(a|b)"


def test_invalid_pattern():
with pytest.raises(ValidationError):
deserialize(re.Pattern, "(a")