add support for MyEnum(str, Enum) (#33)

Fatal1ty · Jan 27, 2021 · 3d32ef1 · 3d32ef1
1 parent 8f92e21
commit 3d32ef1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/mashumaro/serializer/base/metaprogramming.py b/mashumaro/serializer/base/metaprogramming.py
@@ -386,7 +386,9 @@ def _pack_value(
                 raise UnserializableDataError(
                     f"{ftype} as a field type is not supported by mashumaro"
                 )
-        elif issubclass(origin_type, typing.Collection):
+        elif issubclass(origin_type, typing.Collection) and not issubclass(
+            origin_type, enum.Enum
+        ):
             args = getattr(ftype, "__args__", ())
 
             def inner_expr(arg_num=0, v_name="value"):
@@ -567,7 +569,9 @@ def _unpack_field_value(
                 raise UnserializableDataError(
                     f"{ftype} as a field type is not supported by mashumaro"
                 )
-        elif issubclass(origin_type, typing.Collection):
+        elif issubclass(origin_type, typing.Collection) and not issubclass(
+            origin_type, enum.Enum
+        ):
             args = getattr(ftype, "__args__", ())
 
             def inner_expr(arg_num=0, v_name="value"):

diff --git a/tests/entities.py b/tests/entities.py
@@ -11,6 +11,11 @@ class MyEnum(Enum):
     b = "letter b"
 
 
+class MyStrEnum(str, Enum):
+    a = "letter a"
+    b = "letter b"
+
+
 class MyIntEnum(IntEnum):
     a = 1
     b = 2

diff --git a/tests/test_data_types.py b/tests/test_data_types.py
@@ -60,6 +60,7 @@
     MyFlag,
     MyIntEnum,
     MyIntFlag,
+    MyStrEnum,
 )
 from .utils import same_types
 
@@ -84,6 +85,7 @@ class Fixture:
     STR = "123"
     ENUM = MyEnum.a
     INT_ENUM = MyIntEnum.a
+    STR_ENUM = MyStrEnum.a
     FLAG = MyFlag.a
     INT_FLAG = MyIntFlag.a
     DATA_CLASS = MyDataClass(a=1, b=2)
@@ -136,6 +138,7 @@ class Fixture:
     (bytearray, Fixture.BYTE_ARRAY, Fixture.BYTE_ARRAY),
     (str, Fixture.STR, Fixture.STR),
     (MyEnum, Fixture.ENUM, Fixture.ENUM),
+    (MyStrEnum, Fixture.STR_ENUM, Fixture.STR_ENUM),
     (MyIntEnum, Fixture.INT_ENUM, Fixture.INT_ENUM),
     (MyFlag, Fixture.FLAG, Fixture.FLAG),
     (MyIntFlag, Fixture.INT_FLAG, Fixture.INT_FLAG),