Fix import error from ABC classes in Python >= 3.10

devsnd · Jan 28, 2022 · e31044f · e31044f
1 parent ff9979c
commit e31044f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cherrymusicserver/configuration.py b/cherrymusicserver/configuration.py
@@ -38,7 +38,11 @@
 import re
 import weakref
 
-from collections import Mapping, namedtuple
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
+from collections import namedtuple
 from backport.collections import OrderedDict
 from backport import callable
 

diff --git a/tinytag/tinytag.py b/tinytag/tinytag.py
@@ -23,7 +23,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>
 #
 
-from collections import MutableMapping
+try:
+    from collections.abc import MutableMapping
+except ImportError:
+    from collections import MutableMapping
 import codecs
 from functools import reduce
 import struct