Merge pull request #854 from PCMDI/lee1043-patch-1

Import Mapping function from collections.abc to comply with Python 3.10
PCMDI · Jun 10, 2022 · 4cd9f2b · 4cd9f2b
2 parents 9f6e1bf + 1a59193
commit 4cd9f2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pcmdi_metrics/io/base.py b/pcmdi_metrics/io/base.py
@@ -4,7 +4,8 @@
 import logging
 import os
 import re
-from collections import Mapping, OrderedDict
+from collections import OrderedDict
+from collections.abc import Mapping
 
 import cdat_info
 import cdms2

diff --git a/pcmdi_metrics/mjo/lib/dict_merge.py b/pcmdi_metrics/mjo/lib/dict_merge.py
@@ -16,7 +16,7 @@
 #
 # Modifed by Jiwoo Lee, 2020-06-26: Skip merging when dict is empty
 
-import collections
+from collections.abc import Mapping
 
 
 def dict_merge(dct, merge_dct):
@@ -36,7 +36,7 @@ def dict_merge(dct, merge_dct):
  if (
  k in dct
  and isinstance(dct[k], dict)
- and isinstance(merge_dct[k], collections.Mapping)
+ and isinstance(merge_dct[k], Mapping)
  ):
  dict_merge(dct[k], merge_dct[k])
  else:

diff --git a/pcmdi_metrics/variability_mode/lib/dict_merge.py b/pcmdi_metrics/variability_mode/lib/dict_merge.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import collections
+from collections.abc import Mapping
 
 
 def dict_merge(dct, merge_dct):
@@ -32,7 +32,7 @@ def dict_merge(dct, merge_dct):
  if (
  k in dct
  and isinstance(dct[k], dict)
- and isinstance(merge_dct[k], collections.Mapping)
+ and isinstance(merge_dct[k], Mapping)
  ):
  dict_merge(dct[k], merge_dct[k])
  else: