Merge branch 'py-3-10-alpha-5' into 0.10

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10.0-alpha.5', pypy2, pypy3]
       fail-fast: false
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

fail2ban/server/action.py

@@ -30,6 +30,9 @@ import tempfile
 import threading
 import time
 from abc import ABCMeta
+try:
+	from collections.abc import MutableMapping
+except ImportError:
 	from collections import MutableMapping
 
 from .failregex import mapTag2Opt

fail2ban/server/actions.py

@@ -28,6 +28,9 @@ import logging
 import os
 import sys
 import time
+try:
+	from collections.abc import Mapping
+except ImportError:
 	from collections import Mapping
 try:
 	from collections import OrderedDict

fail2ban/server/jails.py

@@ -22,6 +22,9 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko"
 __license__ = "GPL"
 
 from threading import Lock
+try:
+	from collections.abc import Mapping
+except ImportError:
 	from collections import Mapping
 
 from ..exceptions import DuplicateJailException, UnknownJailException