diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-12-18 15:03:11 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-12-18 15:03:11 +0100 |
| commit | 2a10c7b76b7da6aacd7cd6dfe188b2a218d0ba1d (patch) | |
| tree | 5ec1d1184c964ff1d2d974b3df09910a64fd6d9e /addons/document_ftp/ftpserver | |
| parent | ff7626229a2687ed85271c510ecc017e35634056 (diff) | |
| parent | 011b4f00456aeb1f2a51b2d607d9d53da9c2b5e2 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20121218140311-1rw9bqc1nwztfobb
Diffstat (limited to 'addons/document_ftp/ftpserver')
| -rw-r--r-- | addons/document_ftp/ftpserver/__init__.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/ftpserver/abstracted_fs.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index 59aff85c633..b5ada070c84 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -24,7 +24,7 @@ import ftpserver import authorizer import abstracted_fs import logging -from tools import config +from openerp.tools import config _logger = logging.getLogger(__name__) def start_server(): HOST = config.get('ftp_server_host', '127.0.0.1') diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index dd393f1b1e9..a9efac5819c 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -9,12 +9,10 @@ import errno import glob import fnmatch -import pooler -import netsvc -import sql_db +from openerp import pooler, netsvc, sql_db +from openerp.service import security +from openerp.osv import osv -from service import security -from osv import osv from document.document import get_node_context def _get_month_name(month): |