Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v1
Expand Down
Empty file added validobj/tests/__init__.py
Empty file.
6 changes: 5 additions & 1 deletion validobj/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

# https://docs.pytest.org/en/6.2.x/example/pythoncollection.html#customizing-test-collection

collect_ignore = []

if sys.version_info < (3, 12): # pragma: nocover
collect_ignore = ["test_type_syntax.py"]
collect_ignore += ["test_type_syntax.py"]

if sys.version_info < (3, 14): # pragma: nocover
collect_ignore += ["test_delayed_dataclasses.py"]
16 changes: 16 additions & 0 deletions validobj/tests/test_delayed_dataclasses.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from typing import Any
import dataclasses

from validobj import parse_input

@dataclasses.dataclass
class Linked:
value: Any
parents: Linked | list[Linked] | None = None


def test_delayed_annotations():
inp = {'value': 1, 'parents': {'value': 2, 'parents': [{'value': 3}, {'value': 4, 'parents': {'value': 5}}]}}
assert parse_input(inp, Linked).parents.value == 2


5 changes: 4 additions & 1 deletion validobj/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,13 @@ def _parse_dataclass(value, spec):
header=f"Cannot process value into {_typename(spec)!r} because "
f"fields do not match.",
)
# Note: We don't use field.type because of https://github.com/python/cpython/issues/137891
types = spec.__annotations__

res = {}
field_dict = {
# Look inside InitVar
f.name: f.type if not isinstance(f.type, dataclasses.InitVar) else f.type.type
f.name: types[f.name] if not isinstance(f.type, dataclasses.InitVar) else f.type.type
for f in fields
}
for k, v in value.items():
Expand Down
Loading