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

Fix pep8 W604 "backticks are deprecated, use 'repr()'"

pull/1082/head
Lee Clemens 2015-06-25 16:30:47 -04:00
parent 2310ac44c7
commit 8e0145b947
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fail2ban/client/beautifier.py
View File

@ -45,7 +45,8 @@ class Beautifier:
return self.__inputCmd return self.__inputCmd
def beautify(self, response): def beautify(self, response):
logSys.debug("Beautify " + `response` + " with " + `self.__inputCmd`) logSys.debug(
"Beautify " + repr(response) + " with " + repr(self.__inputCmd))
inC = self.__inputCmd inC = self.__inputCmd
msg = response msg = response
try: try:
@ -102,7 +103,7 @@ class Beautifier:
elif response == 4: elif response == 4:
msg = msg + "DEBUG" msg = msg + "DEBUG"
else: else:
msg = msg + `response` msg = msg + repr(response)
elif inC[1] == "dbfile": elif inC[1] == "dbfile":
if response is None: if response is None:
msg = "Database currently disabled" msg = "Database currently disabled"
@ -183,13 +184,14 @@ class Beautifier:
msg += ", ".join(response) msg += ", ".join(response)
except Exception: except Exception:
logSys.warning("Beautifier error. Please report the error") logSys.warning("Beautifier error. Please report the error")
logSys.error("Beautify " + `response` + " with " + `self.__inputCmd` + logSys.error("Beautify " + repr(response) + " with "
" failed") + repr(self.__inputCmd) + " failed")
msg = msg + `response` msg = msg + repr(response)
return msg return msg
def beautifyError(self, response): def beautifyError(self, response):
logSys.debug("Beautify (error) " + `response` + " with " + `self.__inputCmd`) logSys.debug("Beautify (error) " + repr(response) + " with "
+ repr(self.__inputCmd))
msg = response msg = response
if isinstance(response, UnknownJailException): if isinstance(response, UnknownJailException):
msg = "Sorry but the jail '" + response.args[0] + "' does not exist" msg = "Sorry but the jail '" + response.args[0] + "' does not exist"

2
fail2ban/client/configreader.py
View File

@ -233,7 +233,7 @@ class ConfigReaderUnshared(SafeConfigParserWithIncludes):
logSys.log(logLevel, "Non essential option '%s' not defined in '%s'.", option[1], sec) logSys.log(logLevel, "Non essential option '%s' not defined in '%s'.", option[1], sec)
except ValueError: except ValueError:
logSys.warning("Wrong value for '" + option[1] + "' in '" + sec + 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] values[option[1]] = option[2]
return values return values

2
fail2ban/server/filtergamin.py
View File

@ -63,7 +63,7 @@ class FilterGamin(FileFilter):
def callback(self, path, event): 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): if event in (gamin.GAMCreated, gamin.GAMChanged, gamin.GAMExists):
logSys.debug("File changed: " + path) logSys.debug("File changed: " + path)
self.__modified = True self.__modified = True

2
fail2ban/server/transmitter.py
View File

@ -51,7 +51,7 @@ class Transmitter:
def proceed(self, command): def proceed(self, command):
# Deserialize object # Deserialize object
logSys.debug("Command: " + `command`) logSys.debug("Command: " + repr(command))
try: try:
ret = self.__commandHandler(command) ret = self.__commandHandler(command)
ack = 0, ret ack = 0, ret