[REF] auth_ldap: removed openerp.pooler imports.

bzr revid: vmt@openerp.com-20130327115733-0hsqtwasjgcnu28x

1 files changed, 5 insertions, 6 deletions

diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index a63d52209ba..e8778449da5 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -23,7 +23,6 @@ import logging
 from ldap.filter import filter_format
 
 import openerp.exceptions
-from openerp import pooler
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp import SUPERUSER_ID
@@ -188,7 +187,7 @@ class CompanyLDAP(osv.osv):
                 user_id = res[0]
         elif conf['create_user']:
             _logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
-            user_obj = self.pool.get('res.users')
+            user_obj = self.pool['res.users']
             values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
             if conf['user']:
                 user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'],
@@ -246,8 +245,8 @@ class users(osv.osv):
         user_id = super(users, self).login(db, login, password)
         if user_id:
             return user_id
-        cr = pooler.get_db(db).cursor()
-        ldap_obj = pooler.get_pool(db).get('res.company.ldap')
+        cr = self.pool.db.cursor()
+        ldap_obj = self.pool['res.company.ldap']
         for conf in ldap_obj.get_ldap_dicts(cr):
             entry = ldap_obj.authenticate(conf, login, password)
             if entry:
@@ -269,12 +268,12 @@ class users(osv.osv):
         except openerp.exceptions.AccessDenied:
             pass
 
-        cr = pooler.get_db(db).cursor()
+        cr = self.pool.db.cursor()
         cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
                    (int(uid),))
         res = cr.fetchone()
         if res:
-            ldap_obj = pooler.get_pool(db).get('res.company.ldap')
+            ldap_obj = self.pool['res.company.ldap']
             for conf in ldap_obj.get_ldap_dicts(cr):
                 if ldap_obj.authenticate(conf, res[0], passwd):
                     self._uid_cache.setdefault(db, {})[uid] = passwd