feat: fix compatibility issue with python3.8

lidatong · May 23, 2024 · 4c6ab39 · 4c6ab39
1 parent e656b29
commit 4c6ab39
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/dataclasses_json/core.py b/dataclasses_json/core.py
@@ -3,8 +3,13 @@
 import sys
 import warnings
 from collections import defaultdict, namedtuple
-from collections.abc import (Collection as ABCCollection, Mapping as ABCMapping, MutableMapping, MutableSequence,
-                             MutableSet, Sequence, Set)
+if sys.version_info >= (3, 9):
+    from collections.abc import (Collection as ABCCollection, Mapping as ABCMapping, MutableMapping, MutableSequence,
+                                 MutableSet, Sequence, Set)
+else:
+    from typing import (Collection as ABCCollection, Mapping as ABCMapping, MutableMapping, MutableSequence,
+                        MutableSet, Sequence, Set)
+
 from dataclasses import (MISSING,
                          fields,
                          is_dataclass  # type: ignore
@@ -34,7 +39,7 @@
 
 confs = ['encoder', 'decoder', 'mm_field', 'letter_case', 'exclude']
 FieldOverride = namedtuple('FieldOverride', confs)  # type: ignore
-collections_abc_mapping = MappingProxyType({
+collections_abc_type_to_implementation_type = MappingProxyType({
     ABCCollection: tuple,
     ABCMapping: dict,
     MutableMapping: dict,
@@ -322,7 +327,7 @@ def _decode_generic(type_, value, infer_missing):
             materialize_type = type_
 
         # map abstract collection to concrete implementation
-        materialize_type = collections_abc_mapping.get(materialize_type, materialize_type)
+        materialize_type = collections_abc_type_to_implementation_type.get(materialize_type, materialize_type)
 
         res = materialize_type(xs)
     elif _is_generic_dataclass(type_):

diff --git a/tests/entities.py b/tests/entities.py
@@ -19,8 +19,9 @@
 from uuid import UUID
 if sys.version_info >= (3, 9):
     from collections import Counter
+    from collections.abc import Mapping, MutableMapping, MutableSequence, MutableSet, Sequence, Set as ABCSet
 else:
-    from typing import Counter
+    from typing import Counter, Mapping, MutableMapping, MutableSequence, MutableSet, Sequence, Set as ABCSet
 
 from marshmallow import fields