fix: deprecation warnings involving collections.abc

Author: CarlosFdez

mhdata/io/functions.py

@@ -1,5 +1,5 @@
 import typing
-import collections
+from collections import abc
 import copy
 import re
 
@@ -14,12 +14,12 @@ def to_basic(obj, *, stack=[]):
     if obj_id in stack:
         raise Exception("Cyclical reference detected")
 
-    if isinstance(obj, collections.Mapping):
+    if isinstance(obj, abc.Mapping):
         # This can be converted to a dictionary
         return { k:to_basic(v, stack=stack+[obj_id]) for (k, v) in obj.items() }
     elif isinstance(obj, str):
         return obj
-    elif isinstance(obj, collections.Iterable):
+    elif isinstance(obj, abc.Iterable):
         return [to_basic(v, stack=stack+[obj_id]) for v in obj]
     else:
         return obj
@@ -114,7 +114,7 @@ def derive_key(dict):
                 base_entry[key] = data_entries
             else:
                 base_entry[key] = data_entries[0]
-        elif isinstance(data_entries[0], collections.Mapping):
+        elif isinstance(data_entries[0], abc.Mapping):
             util.joindicts(base_entry, data_entries[0])
         else:
             # We cannot merge a dictionary with a non-dictionary

mhdata/load/cfields.py

@@ -2,7 +2,7 @@
 Custom fields used by the marshmallow schema
 """
 
-import collections
+from collections.abc import Mapping
 from marshmallow import fields, ValidationError, Schema, pre_load, post_dump, pre_dump
 
 from mhdata.util import group_fields, ungroup_fields
@@ -76,7 +76,7 @@ def identify_prefixes(self):
 
     @pre_load
     def group_fields(self, data):
-        if not isinstance(data, collections.Mapping):
+        if not isinstance(data, Mapping):
             raise TypeError("Invalid data type, perhaps you forgot many=true?")
         groups = (list(self.__groups__ or [])
                     + self.identify_prefixes())

mhdata/load/validate.py

@@ -1,5 +1,5 @@
 import itertools
-import collections
+from collections import abc
 
 from mhdata import cfg
 from mhdata.io import DataMap
@@ -287,7 +287,7 @@ def validate_weapons(mhdata):
     # Validate weapon ammo settings. Bullet types with clip size zero must have "null state" other attributes.
     for name, ammo_entry in mhdata.weapon_ammo_map.items():
         for key, data in ammo_entry.items():
-            if not isinstance(data, collections.Mapping): continue
+            if not isinstance(data, abc.Mapping): continue
             if 'clip' not in data: continue
 
             if data['clip'] == 0:

mhdata/typecheck.py

@@ -7,7 +7,7 @@
 This module contains such functions.
 """
 
-import collections
+from collections import abc
 
 def is_scalar(value):
     "Returns true if the value is a string, number, or null"
@@ -27,19 +27,19 @@ def is_list(value):
     "Returns true if the object is an iterable that isn't a scalar"
     if is_scalar(value):
         return False
-    return isinstance(value, collections.Iterable)
+    return isinstance(value, abc.Iterable)
 
 
 def is_flat_iterable(value):
     "Returns true if the object is a flat iterable (not a dictionary/string)"
-    if isinstance(value, str) or isinstance(value, collections.Mapping):
+    if isinstance(value, str) or isinstance(value, abc.Mapping):
         return False
-    return isinstance(value, collections.Iterable)
+    return isinstance(value, abc.Iterable)
 
 
 def is_flat_dict(obj : dict) -> bool:
     "Returns true if the dictionary has only scalar values"
-    if not isinstance(obj, collections.Mapping):
+    if not isinstance(obj, abc.Mapping):
         raise Exception("obj is not a dictionary")
     return all({ is_scalar(v) for v in obj.values()})
 
@@ -49,5 +49,5 @@ def is_flat_dict_list(obj_list) -> bool:
     return all(( is_flat_dict(o) for o in obj_list))
 
 def is_dict(obj) -> bool:
-    "Returns true if obj is a dictionary. Mirror for is_instance(obj, collections.Mapping)"
-    return isinstance(obj, collections.Mapping)
+    "Returns true if obj is a dictionary. Mirror for is_instance(obj, abc.Mapping)"
+    return isinstance(obj, abc.Mapping)

mhdata/util/__init__.py

@@ -1,5 +1,4 @@
-import collections
-import collections.abc
+from collections.abc import Mapping
 from mhdata import typecheck
 
 from .bidict import bidict
@@ -73,7 +72,7 @@ def check_not_grouped(obj, groups):
     "Checks if any fields have already been grouped, and returns the ones that aren't"
     results = []
     for group in groups:
-        if group in obj and isinstance(obj[group], collections.Mapping):
+        if group in obj and isinstance(obj[group], Mapping):
             continue
         results.append(group)
     return results