diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2013-03-27 13:31:03 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2013-03-27 13:31:03 +0100 |
| commit | 5849feb6bf3f8d317deb9d4744eac067f52457e2 (patch) | |
| tree | 308d0d99e4c38f466d364f3818e839b4cf26f3f9 /addons/document_ftp | |
| parent | 978f52ba4144de9b6cb8b5ee3525939645a7861c (diff) | |
[REF] document_ftp: removed openerp.pooler imports.
bzr revid: vmt@openerp.com-20130327123103-qjssc3lhual2lbn6
Diffstat (limited to 'addons/document_ftp')
| -rw-r--r-- | addons/document_ftp/ftpserver/abstracted_fs.py | 9 | ||||
| -rw-r--r-- | addons/document_ftp/ftpserver/authorizer.py | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 7f88c81b2c3..a83843eb1a5 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -9,7 +9,8 @@ import errno import glob import fnmatch -from openerp import pooler, netsvc, sql_db +import openerp +from openerp import sql_db import openerp.service from openerp.service import security from openerp.osv import osv @@ -192,7 +193,7 @@ class abstracted_fs(object): if dir: cr = dir.cr uid = dir.uid - pool = pooler.get_pool(node.context.dbname) + pool = openerp.registry(node.context.dbname) object=dir and dir.object or False object2=dir and dir.object2 or False res=pool.get('ir.attachment').search(cr,uid,[('name','like',prefix),('parent_id','=',object and object.type in ('directory','ressource') and object.id or False),('res_id','=',object2 and object2.id or False),('res_model','=',object2 and object2._name or False)]) @@ -291,7 +292,7 @@ class abstracted_fs(object): if dbname not in self.db_list(): raise IOError(errno.ENOENT,'Invalid database path: %s.' % dbname) try: - db = pooler.get_db(dbname) + db = openerp.registry(dbname).db except Exception: raise OSError(1, 'Database cannot be used.') cr = db.cursor() @@ -324,7 +325,7 @@ class abstracted_fs(object): """ Get cr, uid, pool from a node """ assert node - db = pooler.get_db(node.context.dbname) + db = openerp.registry.(node.context.dbname).db return db.cursor(), node.context.uid def get_node_cr(self, node): diff --git a/addons/document_ftp/ftpserver/authorizer.py b/addons/document_ftp/ftpserver/authorizer.py index 5a64ca8f7a0..e863eeb39ec 100644 --- a/addons/document_ftp/ftpserver/authorizer.py +++ b/addons/document_ftp/ftpserver/authorizer.py @@ -48,7 +48,6 @@ class authorizer: if not len(paths)>2: return True db_name = paths[1] - db,pool = pooler.get_db_and_pool(db_name) res = security.login(db_name, username, self.password) return bool(res) |