← Back to branch summary

~ubuntu-branches/ubuntu/quantal/keystone/quantal-security

« back to all changes in this revision

Viewing changes to keystone/common/ldap/core.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-06-22 12:27:50 UTC
  • mto: (35.1.1 quantal-proposed)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: package-import@ubuntu.com-20120622122750-4urdq17en1990apn
Tags: upstream-2012.2~f2~20120622.2353
Import upstream version 2012.2~f2~20120622.2353

Show diffs side-by-side

added added

removed removed

Lines of Context:
keystone/common/ldap/core.py
16
16
 
17
17
import ldap
18
18
 
 
19
from keystone.common.ldap import fakeldap
 
20
from keystone.common import logging
19
21
from keystone import exception
20
 
from keystone.common import logging
21
 
from keystone.common.ldap import fakeldap
22
22
 
23
23
 
24
24
LOG = logging.getLogger(__name__)
79
79
 
80
80
        if self.options_name is not None:
81
81
            self.suffix = conf.ldap.suffix
82
 
            if (self.suffix == None):
 
82
            if self.suffix is None:
83
83
                self.suffix = self.DEFAULT_SUFFIX
84
84
            dn = '%s_tree_dn' % self.options_name
85
85
            self.tree_dn = (getattr(conf.ldap, dn)