From 3e3d1e0cf64232afdfa3d70df87808cd6abb03f6 Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 25 Jun 2015 16:20:55 -0400 Subject: [PATCH 1/3] Fix pep8 W601 ".has_key() is deprecated, use 'in'" --- fail2ban/client/configreader.py | 2 +- fail2ban/server/action.py | 2 +- fail2ban/server/failmanager.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py index d86d6785..3f8abaf4 100644 --- a/fail2ban/client/configreader.py +++ b/fail2ban/client/configreader.py @@ -282,7 +282,7 @@ class DefinitionInitConfigReader(ConfigReader): if self.has_section("Init"): for opt in self.options("Init"): - if not self._initOpts.has_key(opt): + if not opt in self._initOpts: self._initOpts[opt] = self.get("Init", opt) def convert(self): diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py index 58c064da..d94f7812 100644 --- a/fail2ban/server/action.py +++ b/fail2ban/server/action.py @@ -406,7 +406,7 @@ class CommandAction(ActionBase): # recursive definitions are bad #logSys.log(5, 'recursion fail tag: %s value: %s' % (tag, value) ) return False - if found_tag in cls._escapedTags or not tags.has_key(found_tag): + if found_tag in cls._escapedTags or not found_tag in tags: # Escaped or missing tags - just continue on searching after end of match # Missing tags are ok - cInfo can contain aInfo elements like and valid shell # constructs like . diff --git a/fail2ban/server/failmanager.py b/fail2ban/server/failmanager.py index 353f7135..58dcd143 100644 --- a/fail2ban/server/failmanager.py +++ b/fail2ban/server/failmanager.py @@ -91,7 +91,7 @@ class FailManager: ip = ticket.getIP() unixTime = ticket.getTime() matches = ticket.getMatches() - if self.__failList.has_key(ip): + if ip in self.__failList: fData = self.__failList[ip] if fData.getLastReset() < unixTime - self.__maxTime: fData.setLastReset(unixTime) @@ -136,7 +136,7 @@ class FailManager: self.__lock.release() def __delFailure(self, ip): - if self.__failList.has_key(ip): + if ip in self.__failList: del self.__failList[ip] def toBan(self): From 2310ac44c77c44ad19b819de0115574d4f3a11de Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 25 Jun 2015 16:22:22 -0400 Subject: [PATCH 2/3] Fix pep8 W602 "deprecated form of raising exception" --- fail2ban/client/csocket.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fail2ban/client/csocket.py b/fail2ban/client/csocket.py index 86d84a4d..761a17ff 100644 --- a/fail2ban/client/csocket.py +++ b/fail2ban/client/csocket.py @@ -64,6 +64,6 @@ class CSocket: while msg.rfind(CSocket.END_STRING) == -1: chunk = sock.recv(6) if chunk == '': - raise RuntimeError, "socket connection broken" + raise RuntimeError("socket connection broken") msg = msg + chunk return loads(msg) From 8e0145b947ece77ac321fcc2369ca1a273ed02d4 Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 25 Jun 2015 16:30:47 -0400 Subject: [PATCH 3/3] Fix pep8 W604 "backticks are deprecated, use 'repr()'" --- fail2ban/client/beautifier.py | 20 +++++++++++--------- fail2ban/client/configreader.py | 2 +- fail2ban/server/filtergamin.py | 2 +- fail2ban/server/transmitter.py | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fail2ban/client/beautifier.py b/fail2ban/client/beautifier.py index cbe4d327..742cbba6 100644 --- a/fail2ban/client/beautifier.py +++ b/fail2ban/client/beautifier.py @@ -34,18 +34,19 @@ logSys = getLogger(__name__) # converted into user readable messages. class Beautifier: - + def __init__(self, cmd = None): self.__inputCmd = cmd def setInputCmd(self, cmd): self.__inputCmd = cmd - + def getInputCmd(self): return self.__inputCmd - + def beautify(self, response): - logSys.debug("Beautify " + `response` + " with " + `self.__inputCmd`) + logSys.debug( + "Beautify " + repr(response) + " with " + repr(self.__inputCmd)) inC = self.__inputCmd msg = response try: @@ -102,7 +103,7 @@ class Beautifier: elif response == 4: msg = msg + "DEBUG" else: - msg = msg + `response` + msg = msg + repr(response) elif inC[1] == "dbfile": if response is None: msg = "Database currently disabled" @@ -183,13 +184,14 @@ class Beautifier: msg += ", ".join(response) except Exception: logSys.warning("Beautifier error. Please report the error") - logSys.error("Beautify " + `response` + " with " + `self.__inputCmd` + - " failed") - msg = msg + `response` + logSys.error("Beautify " + repr(response) + " with " + + repr(self.__inputCmd) + " failed") + msg = msg + repr(response) return msg def beautifyError(self, response): - logSys.debug("Beautify (error) " + `response` + " with " + `self.__inputCmd`) + logSys.debug("Beautify (error) " + repr(response) + " with " + + repr(self.__inputCmd)) msg = response if isinstance(response, UnknownJailException): msg = "Sorry but the jail '" + response.args[0] + "' does not exist" diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py index 3f8abaf4..c0e13460 100644 --- a/fail2ban/client/configreader.py +++ b/fail2ban/client/configreader.py @@ -233,7 +233,7 @@ class ConfigReaderUnshared(SafeConfigParserWithIncludes): logSys.log(logLevel, "Non essential option '%s' not defined in '%s'.", option[1], sec) except ValueError: logSys.warning("Wrong value for '" + option[1] + "' in '" + sec + - "'. Using default one: '" + `option[2]` + "'") + "'. Using default one: '" + repr(option[2]) + "'") values[option[1]] = option[2] return values diff --git a/fail2ban/server/filtergamin.py b/fail2ban/server/filtergamin.py index ac1fdf27..e8473be4 100644 --- a/fail2ban/server/filtergamin.py +++ b/fail2ban/server/filtergamin.py @@ -63,7 +63,7 @@ class FilterGamin(FileFilter): def callback(self, path, event): - logSys.debug("Got event: " + `event` + " for " + path) + logSys.debug("Got event: " + repr(event) + " for " + path) if event in (gamin.GAMCreated, gamin.GAMChanged, gamin.GAMExists): logSys.debug("File changed: " + path) self.__modified = True diff --git a/fail2ban/server/transmitter.py b/fail2ban/server/transmitter.py index 5bf62128..565443d2 100644 --- a/fail2ban/server/transmitter.py +++ b/fail2ban/server/transmitter.py @@ -51,7 +51,7 @@ class Transmitter: def proceed(self, command): # Deserialize object - logSys.debug("Command: " + `command`) + logSys.debug("Command: " + repr(command)) try: ret = self.__commandHandler(command) ack = 0, ret