1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-16 12:23:59 +02:00

fail2ban: fix patch for python 3.10

89d5d2e091 only patched importing
MutableMapping from collections, but importing Mapping has to be patched
too

Closes: #18681
Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
(cherry picked from commit 4bd2169e73)
This commit is contained in:
Michal Vasilek 2022-06-20 12:21:01 +02:00 committed by Josef Schlehofer
parent 3c5270c9d9
commit bf519e9bc4
No known key found for this signature in database
GPG Key ID: B950216FE4329F4C

View File

@ -1,8 +1,9 @@
From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001 From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <serg.brester@sebres.de> From: "Sergey G. Brester" <serg.brester@sebres.de>
Date: Mon, 8 Feb 2021 17:19:24 +0100 Date: Mon, 8 Feb 2021 17:19:24 +0100
Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes` Subject: [PATCH 2/4] follow bpo-37324:
moved to the :mod:`collections.abc` module :ref:`collections-abstract-base-classes` moved to the :mod:`collections.abc`
module
(since 3.10-alpha.5 `MutableMapping` is missing in collections module) (since 3.10-alpha.5 `MutableMapping` is missing in collections module)
--- ---
@ -23,3 +24,31 @@ Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
from .failregex import mapTag2Opt from .failregex import mapTag2Opt
from .ipdns import DNSUtils 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