openstack/keystone
Code Issues Proposed changes

Merge "Eliminate type error on search_s"

Browse Source
This commit is contained in:
Jenkins 2013-09-29 17:02:00 +00:00 committed by Gerrit Code Review
commit aa7a110247
1 changed files with 2 additions and 1 deletions

3
keystone/common/ldap/core.py

@ -556,7 +556,8 @@ class LdapWrapper(object):
# allows us to set mapped attributes to "None" as defaults in config.
# Without this filtering, the ldap query would raise a TypeError since
# attrlist is expected to be an iterable of strings.
attrlist = [attr for attr in attrlist if attr is not None]
if attrlist is not None:
attrlist = [attr for attr in attrlist if attr is not None]
LOG.debug(_(
'LDAP search: dn=%(dn)s, scope=%(scope)s, query=%(query)s, '
'attrs=%(attrlist)s') % {