summaryrefslogtreecommitdiff
path: root/addons/document/ftpserver/ftpserver.py
diff options
context:
space:
mode:
Diffstat (limited to 'addons/document/ftpserver/ftpserver.py')
-rw-r--r--addons/document/ftpserver/ftpserver.py5
1 files changed, 4 insertions, 1 deletions
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 = []