|
|
- From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
- From: "Sergey G. Brester" <serg.brester@sebres.de>
- Date: Mon, 8 Feb 2021 17:19:24 +0100
- Subject: [PATCH 2/4] follow bpo-37324:
- :ref:`collections-abstract-base-classes` moved to the :mod:`collections.abc`
- module
-
- (since 3.10-alpha.5 `MutableMapping` is missing in collections module)
- ---
- fail2ban/server/action.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
- --- a/fail2ban/server/action.py
- +++ b/fail2ban/server/action.py
- @@ -30,7 +30,10 @@ import tempfile
- import threading
- import time
- from abc import ABCMeta
- -from collections import MutableMapping
- +try:
- + from collections.abc import MutableMapping
- +except ImportError:
- + from collections import MutableMapping
-
- from .failregex import mapTag2Opt
- from .ipdns import DNSUtils
- --- a/fail2ban/server/actions.py
- +++ b/fail2ban/server/actions.py
- @@ -28,7 +28,10 @@ import logging
- import os
- import sys
- import time
- -from collections import Mapping
- +try:
- + from collections.abc import Mapping
- +except ImportError:
- + from collections import Mapping
- try:
- from collections import OrderedDict
- except ImportError:
- --- a/fail2ban/server/jails.py
- +++ b/fail2ban/server/jails.py
- @@ -22,7 +22,10 @@ __copyright__ = "Copyright (c) 2004 Cyri
- __license__ = "GPL"
-
- from threading import Lock
- -from collections import Mapping
- +try:
- + from collections.abc import Mapping
- +except ImportError:
- + from collections import Mapping
-
- from ..exceptions import DuplicateJailException, UnknownJailException
- from .jail import Jail
|
