mirror of https://github.com/fail2ban/fail2ban
BF: Resolve Deprecation Warnings for python3
Mainly python imp -> importlib for python3.3+, and other minor tweakspull/592/head
parent
79da66df5d
commit
e614a2f4a4
|
@ -118,7 +118,7 @@ class JailReader(ConfigReader):
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
self.__filter = None
|
self.__filter = None
|
||||||
logSys.warn("No filter set for jail %s" % self.__name)
|
logSys.warning("No filter set for jail %s" % self.__name)
|
||||||
|
|
||||||
# Read action
|
# Read action
|
||||||
for act in self.__opts["action"].split('\n'):
|
for act in self.__opts["action"].split('\n'):
|
||||||
|
|
|
@ -26,6 +26,10 @@ __license__ = "GPL"
|
||||||
|
|
||||||
import time, logging
|
import time, logging
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
if sys.version_info >= (3, 3):
|
||||||
|
import importlib
|
||||||
|
else:
|
||||||
import imp
|
import imp
|
||||||
from collections import Mapping
|
from collections import Mapping
|
||||||
|
|
||||||
|
@ -95,6 +99,10 @@ class Actions(JailThread, Mapping):
|
||||||
action = CommandAction(self._jail, name)
|
action = CommandAction(self._jail, name)
|
||||||
else:
|
else:
|
||||||
pythonModuleName = os.path.basename(pythonModule.strip(".py"))
|
pythonModuleName = os.path.basename(pythonModule.strip(".py"))
|
||||||
|
if sys.version_info >= (3, 3):
|
||||||
|
customActionModule = importlib.machinery.SourceFileLoader(
|
||||||
|
pythonModuleName, pythonModule).load_module()
|
||||||
|
else:
|
||||||
customActionModule = imp.load_source(
|
customActionModule = imp.load_source(
|
||||||
pythonModuleName, pythonModule)
|
pythonModuleName, pythonModule)
|
||||||
if not hasattr(customActionModule, "Action"):
|
if not hasattr(customActionModule, "Action"):
|
||||||
|
|
|
@ -187,7 +187,7 @@ class DateStrptime(DateTemplate):
|
||||||
date += delta
|
date += delta
|
||||||
date = date.replace(tzinfo=iso8601.Utc())
|
date = date.replace(tzinfo=iso8601.Utc())
|
||||||
else:
|
else:
|
||||||
logSys.warn("No _z group captured and %%z is not supported on current platform"
|
logSys.warning("No _z group captured and %%z is not supported on current platform"
|
||||||
" - timezone ignored and assumed to be localtime. date: %s on line: %s"
|
" - timezone ignored and assumed to be localtime. date: %s on line: %s"
|
||||||
% (date, line))
|
% (date, line))
|
||||||
|
|
||||||
|
|
|
@ -849,7 +849,7 @@ class DNSUtils:
|
||||||
try:
|
try:
|
||||||
return set(socket.gethostbyname_ex(dns)[2])
|
return set(socket.gethostbyname_ex(dns)[2])
|
||||||
except socket.error, e:
|
except socket.error, e:
|
||||||
logSys.warn("Unable to find a corresponding IP address for %s: %s"
|
logSys.warning("Unable to find a corresponding IP address for %s: %s"
|
||||||
% (dns, e))
|
% (dns, e))
|
||||||
return list()
|
return list()
|
||||||
except socket.error, e:
|
except socket.error, e:
|
||||||
|
|
|
@ -138,7 +138,7 @@ class DatabaseTest(unittest.TestCase):
|
||||||
ticket = FailTicket("127.0.0.1", 0, ["abc\n"])
|
ticket = FailTicket("127.0.0.1", 0, ["abc\n"])
|
||||||
self.db.addBan(self.jail, ticket)
|
self.db.addBan(self.jail, ticket)
|
||||||
|
|
||||||
self.assertEquals(len(self.db.getBans(jail=self.jail)), 1)
|
self.assertEqual(len(self.db.getBans(jail=self.jail)), 1)
|
||||||
self.assertTrue(
|
self.assertTrue(
|
||||||
isinstance(self.db.getBans(jail=self.jail)[0], FailTicket))
|
isinstance(self.db.getBans(jail=self.jail)[0], FailTicket))
|
||||||
|
|
||||||
|
@ -146,8 +146,8 @@ class DatabaseTest(unittest.TestCase):
|
||||||
self.testAddJail()
|
self.testAddJail()
|
||||||
ticket = FailTicket("127.0.0.1", MyTime.time() - 40, ["abc\n"])
|
ticket = FailTicket("127.0.0.1", MyTime.time() - 40, ["abc\n"])
|
||||||
self.db.addBan(self.jail, ticket)
|
self.db.addBan(self.jail, ticket)
|
||||||
self.assertEquals(len(self.db.getBans(jail=self.jail,bantime=50)), 1)
|
self.assertEqual(len(self.db.getBans(jail=self.jail,bantime=50)), 1)
|
||||||
self.assertEquals(len(self.db.getBans(jail=self.jail,bantime=20)), 0)
|
self.assertEqual(len(self.db.getBans(jail=self.jail,bantime=20)), 0)
|
||||||
|
|
||||||
def testGetBansMerged(self):
|
def testGetBansMerged(self):
|
||||||
self.testAddJail()
|
self.testAddJail()
|
||||||
|
|
Loading…
Reference in New Issue