Merge pull request #17 from jfuruness/main

Modified collections import and added 3.10 to nox file

Author: smarie

ci_tools/nox_utils.py

@@ -22,6 +22,7 @@
 
 
 PY27, PY35, PY36, PY37, PY38, PY39 = "2.7", "3.5", "3.6", "3.7", "3.8", "3.9"
+PY310 = "3.10"
 DONT_INSTALL = "dont_install"
 
 

noxfile.py

@@ -9,14 +9,15 @@
 # add parent folder to python path so that we can import noxfile_utils.py
 # note that you need to "pip install -r noxfile-requiterements.txt" for this file to work.
 sys.path.append(str(Path(__file__).parent / "ci_tools"))
-from nox_utils import PY27, PY37, PY36, PY35, PY38, PY39, power_session, rm_folder, rm_file, PowerSession  # noqa
+from nox_utils import PY27, PY37, PY36, PY35, PY38, PY39, PY310, power_session, rm_folder, rm_file, PowerSession  # noqa
 
 
 pkg_name = "yamlable"
 gh_org = "smarie"
 gh_repo = "python-yamlable"
 
 ENVS = {
+    PY310: {"coverage": False, "pkg_specs": {"pip": ">19"}},
     PY39: {"coverage": False, "pkg_specs": {"pip": ">19"}},
     PY27: {"coverage": False, "pkg_specs": {"pip": ">10"}},
     PY35: {"coverage": False, "pkg_specs": {"pip": ">10", "PyYaml": "<5"}},

yamlable/main.py

@@ -3,7 +3,11 @@
 #
 #  License: 3-clause BSD, <https://github.com/smarie/python-yamlable/blob/master/LICENSE>
 
-import collections
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
+
 from abc import abstractmethod, ABCMeta
 
 import six
@@ -520,7 +524,7 @@ def encode(cls, dumper, obj,
         """
         # Convert objects to a dictionary of their representation
         yaml_tag_suffix, obj_as_dict = cls.to_yaml_dict(obj)
-        if not isinstance(obj_as_dict, collections.Mapping) or not isinstance(yaml_tag_suffix, str):
+        if not isinstance(obj_as_dict, Mapping) or not isinstance(yaml_tag_suffix, str):
             raise TypeError("`to_yaml_dict` did not return correct results. It should return a tuple of "
                             "`yaml_tag_suffix, obj_as_dict`")