From 3e3d1e0cf64232afdfa3d70df87808cd6abb03f6 Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 25 Jun 2015 16:20:55 -0400 Subject: [PATCH] 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):