mirror of
https://github.com/coolsnowwolf/packages
synced 2025-01-08 11:17:36 +08:00
fail2ban: fix patch for python 3.10
89d5d2e091c8da10a1c963158a6de92b05079116 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>
This commit is contained in:
parent
cb3e6c2550
commit
5201c73363
@ -1,8 +1,9 @@
|
||||
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] follow bpo-37324: :ref:`collections-abstract-base-classes`
|
||||
moved to the :mod:`collections.abc` module
|
||||
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)
|
||||
---
|
||||
@ -23,3 +24,31 @@ Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user