diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/document_ftp | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/ftpserver/__init__.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/ftpserver/abstracted_fs.py | 9 | ||||
| -rw-r--r-- | addons/document_ftp/res_config.py | 4 | ||||
| -rw-r--r-- | addons/document_ftp/test_easyftp.py | 2 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_browse.py | 4 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration.py | 4 |
6 files changed, 11 insertions, 14 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 326c62f7a92..b3fd39bdfcd 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -9,12 +9,9 @@ import errno import glob import fnmatch -import pooler -import netsvc -import sql_db - -from service import security -from osv import osv +from openerp import pooler, netsvc, sql_db +from openerp.service import security +from openerp.osv import osv from document.nodes import get_node_context def _get_month_name(month): diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py index 374368d60bd..93b3aa69974 100644 --- a/addons/document_ftp/res_config.py +++ b/addons/document_ftp/res_config.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields, osv -from tools import config +from openerp.osv import fields, osv +from openerp.tools import config class documnet_ftp_setting(osv.osv_memory): _name = 'knowledge.config.settings' diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index bb4e5ea6648..1ab808c3acc 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -25,7 +25,7 @@ """ from ftplib import FTP -from tools import config +from openerp.tools import config def get_plain_ftp(timeout=10.0): ftp = FTP() diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py index 8260424d653..ceb7d1a60e5 100644 --- a/addons/document_ftp/wizard/ftp_browse.py +++ b/addons/document_ftp/wizard/ftp_browse.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import osv, fields -# from tools.translate import _ +from openerp.osv import fields, osv +# from openerp.tools.translate import _ from .. import ftpserver class document_ftp_browse(osv.osv_memory): diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py index d0679973c5a..87aaa2331b4 100644 --- a/addons/document_ftp/wizard/ftp_configuration.py +++ b/addons/document_ftp/wizard/ftp_configuration.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import osv, fields -from tools import config +from openerp.osv import fields, osv +from openerp.tools import config class document_ftp_configuration(osv.osv_memory): |