Merge pull request #438 from acolley-gel/main

Fix frozenset union with prim #437
yukinarit · Oct 25, 2023 · d9c19c1 · d9c19c1
2 parents fead102 + 44274ce
commit d9c19c1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/serde/core.py b/serde/core.py
@@ -413,7 +413,7 @@ def is_list_instance(obj: Any, typ: Type[Any]) -> bool:
 
 
 def is_set_instance(obj: Any, typ: Type[Any]) -> bool:
-    if not isinstance(obj, set):
+    if not isinstance(obj, (set, frozenset)):
         return False
     if len(obj) == 0 or is_bare_set(typ):
         return True

diff --git a/tests/test_union.py b/tests/test_union.py
@@ -2,7 +2,7 @@
 import sys
 from dataclasses import dataclass
 from ipaddress import IPv4Address
-from typing import Dict, Generic, List, NewType, Optional, Tuple, TypeVar, Union
+from typing import Dict, FrozenSet, Generic, List, NewType, Optional, Tuple, TypeVar, Union
 from uuid import UUID
 
 import pytest
@@ -763,3 +763,12 @@ class Bar:
     # untagged tagged
     s = to_json(bar, cls=Untagged(Union[Foo, Bar]))
     assert bar == from_json(Untagged(Union[Foo, Bar]), s)
+
+
+def test_union_frozenset_with_prim():
+    @serde
+    @dataclass
+    class Foo:
+        a: Union[FrozenSet[int], int]
+
+    assert to_dict(Foo(frozenset({1}))) == {"a": {1}}