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

Fix use of python3 bytes in client/server socket for python2.5

pull/128/merge^2
Steven Hiscocks 2013-02-24 18:04:40 +00:00
parent e28a698c0e
commit 0dd3a81ba2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/csocket.py
View File

@ -34,7 +34,7 @@ import socket, sys
class CSocket: class CSocket:
if sys.version_info >= (3,): if sys.version_info >= (3,):
END_STRING = b"<F2B_END_COMMAND>" END_STRING = bytes("<F2B_END_COMMAND>", encoding='ascii')
else: else:
END_STRING = "<F2B_END_COMMAND>" END_STRING = "<F2B_END_COMMAND>"
@ -56,7 +56,7 @@ class CSocket:
#@staticmethod #@staticmethod
def receive(sock): def receive(sock):
if sys.version_info >= (3,): if sys.version_info >= (3,):
msg = b'' msg = bytes("", encoding='ascii')
else: else:
msg = '' msg = ''
while msg.rfind(CSocket.END_STRING) == -1: while msg.rfind(CSocket.END_STRING) == -1:

4
server/asyncserver.py
View File

@ -43,7 +43,7 @@ logSys = logging.getLogger("fail2ban.server")
class RequestHandler(asynchat.async_chat): class RequestHandler(asynchat.async_chat):
if sys.version_info >= (3,): if sys.version_info >= (3,):
END_STRING = b"<F2B_END_COMMAND>" END_STRING = bytes("<F2B_END_COMMAND>", encoding="ascii")
else: else:
END_STRING = "<F2B_END_COMMAND>" END_STRING = "<F2B_END_COMMAND>"
@ -66,7 +66,7 @@ class RequestHandler(asynchat.async_chat):
def found_terminator(self): def found_terminator(self):
# Joins the buffer items. # Joins the buffer items.
if sys.version_info >= (3,): if sys.version_info >= (3,):
message = loads(b"".join(self.__buffer)) message = loads(bytes("", encoding="ascii").join(self.__buffer))
else: else:
message = loads("".join(self.__buffer)) message = loads("".join(self.__buffer))
# Gives the message to the transmitter. # Gives the message to the transmitter.