From 58fe9c62e673a3695afb3c0a983f6ec53c2a8a88 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Tue, 27 Oct 2009 09:32:21 +0100 Subject: [PATCH] [IMP] better python2.5/2.6 compatibility handling bzr revid: olt@tinyerp.com-20091027083221-37mv4k6lei43xfla --- addons/document/ftpserver/ftpserver.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py index 13c44287303..94bc5b3d90c 100644 --- a/addons/document/ftpserver/ftpserver.py +++ b/addons/document/ftpserver/ftpserver.py @@ -1412,10 +1412,7 @@ class FTPHandler(asynchat.async_chat): established connection. - (instance) server: the ftp server class instance. """ - try: - asynchat.async_chat.__init__(self, conn=conn) # python2.5 - except TypeError, e: - asynchat.async_chat.__init__(self, sock=conn) # python2.6 + asynchat.async_chat.__init__(self, conn) self.server = server self.remote_ip, self.remote_port = self.socket.getpeername()[:2] self.in_buffer = []