diff --git a/document_ftp/ftpserver/__init__.py b/document_ftp/ftpserver/__init__.py index 285a4410..95b3a889 100644 --- a/document_ftp/ftpserver/__init__.py +++ b/document_ftp/ftpserver/__init__.py @@ -55,7 +55,7 @@ def start_server(): ftpserver.FTPHandler.authorizer = autho ftpserver.max_cons = 300 ftpserver.max_cons_per_ip = 50 - ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs + ftpserver.FTPHandler.abstracted_fs = abstracted_fs.AbstractedFs if PASSIVE_PORTS: ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS diff --git a/document_ftp/ftpserver/ftpserver.py b/document_ftp/ftpserver/ftpserver.py index c3acba05..c3642823 100755 --- a/document_ftp/ftpserver/ftpserver.py +++ b/document_ftp/ftpserver/ftpserver.py @@ -123,6 +123,7 @@ import random import stat from collections import deque from tarfile import filemode +import logging LOG_ACTIVE = True @@ -239,12 +240,12 @@ class AuthorizerError(Error): def log(msg): """Log messages intended for the end user.""" if LOG_ACTIVE: - print msg + logger.info('%s', msg) def logline(msg): """Log commands and responses passing through the command channel.""" if LOG_ACTIVE: - print msg + logger.info('%s', msg) def logerror(msg): """Log traceback outputs occurring in case of errors.""" @@ -1400,7 +1401,7 @@ class FTPHandler(asynchat.async_chat): self.set_terminator("\r\n") # session attributes - self.fs = self.abstracted_fs() + self.fs = self.AbstractedFs() self.authenticated = False self.username = "" self.password = "" diff --git a/document_ftp/res_config.py b/document_ftp/res_config.py index 90371821..b824c4d7 100644 --- a/document_ftp/res_config.py +++ b/document_ftp/res_config.py @@ -21,10 +21,11 @@ # ############################################################################## -from openerp.osv import fields, osv +from openerp.osv import fields +from openerp.osv.orm import TransientModel from openerp.tools import config -class DocumentFtpSetting(osv.osv_memory): +class DocumentFtpSetting(TransientModel): _name = 'knowledge.config.settings' _inherit = 'knowledge.config.settings' _columns = { diff --git a/document_ftp/wizard/ftp_browse.py b/document_ftp/wizard/ftp_browse.py index e418d561..f4c65b09 100644 --- a/document_ftp/wizard/ftp_browse.py +++ b/document_ftp/wizard/ftp_browse.py @@ -21,10 +21,11 @@ # ############################################################################## -from openerp.osv import fields, osv +from openerp.osv import fields +from openerp.osv.orm import TransientModel from .. import ftpserver -class DocumentFtpBrowse(osv.osv_memory): +class DocumentFtpBrowse(TransientModel): _name = 'document.ftp.browse' _description = 'Document FTP Browse' diff --git a/document_ftp/wizard/ftp_configuration.py b/document_ftp/wizard/ftp_configuration.py index 08c57820..ae16f2c1 100644 --- a/document_ftp/wizard/ftp_configuration.py +++ b/document_ftp/wizard/ftp_configuration.py @@ -21,8 +21,8 @@ # ############################################################################## -from openerp.osv import fields, osv -from openerp.osv.orm import TransientModel +from openerp.osv import fields +from openerp.osv.orm import field, TransientModel from openerp.tools import config class DocumentFtpConfiguration(TransientModel):