From 87fe5ef53ff0fb050a3b609c2a38c51e62b7a2fe Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Thu, 22 Oct 2009 12:06:47 +0200 Subject: [PATCH] [FIX] python2.6 compatibility bzr revid: olt@tinyerp.com-20091022100647-1hqb0w9gm0awokh2 --- addons/document/ftpserver/ftpserver.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py index ae0fc38e1e1..13c44287303 100644 --- a/addons/document/ftpserver/ftpserver.py +++ b/addons/document/ftpserver/ftpserver.py @@ -1412,7 +1412,10 @@ class FTPHandler(asynchat.async_chat): established connection. - (instance) server: the ftp server class instance. """ - asynchat.async_chat.__init__(self, conn=conn) + try: + asynchat.async_chat.__init__(self, conn=conn) # python2.5 + except TypeError, e: + asynchat.async_chat.__init__(self, sock=conn) # python2.6 self.server = server self.remote_ip, self.remote_port = self.socket.getpeername()[:2] self.in_buffer = []