From 279755b10b0a2981309032c64926a05b4ffbeb14 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 20 Aug 2015 10:07:27 +0200 Subject: [PATCH] [FIX] users_ldap_populate: Protect ldap library import --- users_ldap_populate/__openerp__.py | 3 +++ users_ldap_populate/model/users_ldap.py | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/users_ldap_populate/__openerp__.py b/users_ldap_populate/__openerp__.py index 7c0afd05b..314998c06 100644 --- a/users_ldap_populate/__openerp__.py +++ b/users_ldap_populate/__openerp__.py @@ -41,6 +41,9 @@ object you want to query. "depends": [ 'auth_ldap', ], + 'external_dependencies': { + 'python': ['ldap'], + }, "data": [ 'view/users_ldap.xml', 'view/populate_wizard.xml', diff --git a/users_ldap_populate/model/users_ldap.py b/users_ldap_populate/model/users_ldap.py index 7d02166a1..8edb5ef37 100644 --- a/users_ldap_populate/model/users_ldap.py +++ b/users_ldap_populate/model/users_ldap.py @@ -20,10 +20,16 @@ ############################################################################## import re -from ldap.filter import filter_format from openerp.osv import orm import logging +_logger = logging.getLogger(__name__) + +try: + from ldap.filter import filter_format +except ImportError: + _logger.debug('Can not `from ldap.filter import filter_format`.') + class CompanyLDAP(orm.Model): _inherit = 'res.company.ldap'