tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use explicit default keyword for config

Browse Source 
issue4662
review8051002
This commit is contained in:
Cédric Krier
2015-03-22 03:18:59 +01:00
parent 6694196042
commit fc328f56fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res.py
+4 -4
View File
@@ -44,7 +44,7 @@ def ldap_connection():
scheme, port = 'ldap', 389
conn = ldap.initialize('%s://%s:%s/' % (
scheme, uri.hostname, uri.port or port))
if config.getboolean(section, 'active_directory', False):
if config.getboolean(section, 'active_directory', default=False):
conn.set_option(ldap.OPT_REFERRALS, 0)
if 'tls' in uri.scheme:
conn.start_tls_s()
@@ -83,7 +83,7 @@ class User:
'onelevel': ldap.SCOPE_ONELEVEL,
'subtree': ldap.SCOPE_SUBTREE,
}.get(scope)
uid = config.get(section, 'uid', 'uid')
uid = config.get(section, 'uid', default='uid')
if filter_:
filter_ = '(&(%s=%s)%s)' % (uid, login, filter_)
else:
@@ -139,7 +139,7 @@ class User:
con = ldap_connection()
if con:
user = cls(Transaction().user)
uid = config.get(section, 'uid', 'uid')
uid = config.get(section, 'uid', default='uid')
users = cls.ldap_search_user(user.login, con, attrs=[uid])
if users and len(users) == 1:
[(dn, attrs)] = users
@@ -161,7 +161,7 @@ class User:
try:
con = ldap_connection()
if con:
uid = config.get(section, 'uid', 'uid')
uid = config.get(section, 'uid', default='uid')
users = cls.ldap_search_user(login, con, attrs=[uid])
if users and len(users) == 1:
[(dn, attrs)] = users