diff options
| author | olt@tinyerp.com <> | 2009-10-22 12:06:47 +0200 |
|---|---|---|
| committer | olt@tinyerp.com <> | 2009-10-22 12:06:47 +0200 |
| commit | 87fe5ef53ff0fb050a3b609c2a38c51e62b7a2fe (patch) | |
| tree | c14e6856bfbbaba2beb9a787674716c6c1a8208d /addons/document/ftpserver/ftpserver.py | |
| parent | 28bd548716b00c8d2b5debde76f665f26a0d7c55 (diff) | |
[FIX] python2.6 compatibility
bzr revid: olt@tinyerp.com-20091022100647-1hqb0w9gm0awokh2
Diffstat (limited to 'addons/document/ftpserver/ftpserver.py')
| -rw-r--r-- | addons/document/ftpserver/ftpserver.py | 5 |
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 = [] |