[REF] document_ftp: removed openerp.pooler imports.
bzr revid: vmt@openerp.com-20130327123103-qjssc3lhual2lbn6
This commit is contained in:
parent
978f52ba41
commit
5849feb6bf
|
@ -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):
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue