github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix pep8 W601 ".has_key() is deprecated, use 'in'"

pull/1082/head
Lee Clemens 2015-06-25 16:20:55 -04:00
parent f899340b15
commit 3e3d1e0cf6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fail2ban/client/configreader.py
View File

@ -282,7 +282,7 @@ class DefinitionInitConfigReader(ConfigReader):
if self.has_section("Init"): if self.has_section("Init"):
for opt in self.options("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) self._initOpts[opt] = self.get("Init", opt)
def convert(self): def convert(self):

2
fail2ban/server/action.py
View File

@ -406,7 +406,7 @@ class CommandAction(ActionBase):
# recursive definitions are bad # recursive definitions are bad
#logSys.log(5, 'recursion fail tag: %s value: %s' % (tag, value) ) #logSys.log(5, 'recursion fail tag: %s value: %s' % (tag, value) )
return False 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 # Escaped or missing tags - just continue on searching after end of match
# Missing tags are ok - cInfo can contain aInfo elements like <HOST> and valid shell # Missing tags are ok - cInfo can contain aInfo elements like <HOST> and valid shell
# constructs like <STDIN>. # constructs like <STDIN>.

4
fail2ban/server/failmanager.py
View File

@ -91,7 +91,7 @@ class FailManager:
ip = ticket.getIP() ip = ticket.getIP()
unixTime = ticket.getTime() unixTime = ticket.getTime()
matches = ticket.getMatches() matches = ticket.getMatches()
if self.__failList.has_key(ip): if ip in self.__failList:
fData = self.__failList[ip] fData = self.__failList[ip]
if fData.getLastReset() < unixTime - self.__maxTime: if fData.getLastReset() < unixTime - self.__maxTime:
fData.setLastReset(unixTime) fData.setLastReset(unixTime)
@ -136,7 +136,7 @@ class FailManager:
self.__lock.release() self.__lock.release()
def __delFailure(self, ip): def __delFailure(self, ip):
if self.__failList.has_key(ip): if ip in self.__failList:
del self.__failList[ip] del self.__failList[ip]
def toBan(self): def toBan(self):