♿ Python 3.8-compatible Mapping import

DeprecationWarning: Using or importing the ABCs from 'collections'
instead of from 'collections.abc' is deprecated, and in 3.8 it will stop
working
  isinstance(base, collections.Mapping)

unihan_etl/_compat.py

@@ -1,6 +1,7 @@
 # -*- coding: utf8 -*-
 # flake8: noqa
 
+import collections
 import sys
 
 PY2 = sys.version_info[0] == 2
@@ -16,6 +17,8 @@
     from urllib import urlretrieve
     from itertools import izip
 
+    Mapping = collections.Mapping
+
     exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
 else:
     unichr = chr
@@ -28,6 +31,8 @@
 
     izip = zip
 
+    Mapping = collections.abc.Mapping
+
     def reraise(tp, value, tb=None):
         if value.__traceback__ is not tb:
             raise (value.with_traceback(tb))

unihan_etl/util.py

@@ -11,7 +11,7 @@
 import re
 import sys
 
-from ._compat import string_types, text_type, unichr
+from ._compat import Mapping, string_types, text_type, unichr
 
 
 def ucn_to_unicode(ucn):
@@ -98,15 +98,12 @@ def merge_dict(base, additional):
     if additional is None:
         return base
 
-    if not (
-        isinstance(base, collections.Mapping)
-        and isinstance(additional, collections.Mapping)
-    ):
+    if not (isinstance(base, Mapping) and isinstance(additional, Mapping)):
         return additional
 
     merged = base
     for key, value in additional.items():
-        if isinstance(value, collections.Mapping):
+        if isinstance(value, Mapping):
             merged[key] = merge_dict(merged.get(key), value)
         else:
             merged[key] = value