Merge pull request #232 from pedrobaeza/8.0-import_ldap_fix

[FIX] users_ldap_populate: Protect ldap library import
OCA · Aug 21, 2015 · 603ceb8 · 603ceb8
2 parents 8ef3603 + 279755b
commit 603ceb8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/users_ldap_populate/__openerp__.py b/users_ldap_populate/__openerp__.py
@@ -41,6 +41,9 @@
     "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
@@ -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'