Remove use_ldap2 constant.

This commit is contained in:
Pavel Zuna 2009-06-16 13:38:20 +02:00 committed by Rob Crittenden
parent ebdebe802d
commit 8c7883364c
2 changed files with 7 additions and 16 deletions

View File

@ -109,7 +109,6 @@ DEFAULT_CONFIG = (
('verbose', False),
('debug', False),
('mode', 'production'),
('use_ldap2', False),
# CA plugin:
('ca_host', object), # Set in Env._finalize_core()

View File

@ -473,21 +473,13 @@ class Command(HasParam):
return dict(self.__attributes_2_entry(kw))
def __attributes_2_entry(self, kw):
if self.api.env.use_ldap2:
for name in self.params:
if self.params[name].attribute and name in kw:
value = kw[name]
if isinstance(value, tuple):
yield (name, [v for v in value])
else:
yield (name, kw[name])
else:
for name in self.params:
if self.params[name].attribute and name in kw:
if type(kw[name]) is tuple:
yield (name, [str(value) for value in kw[name]])
else:
yield (name, str(kw[name]))
for name in self.params:
if self.params[name].attribute and name in kw:
value = kw[name]
if isinstance(value, tuple):
yield (name, [v for v in value])
else:
yield (name, kw[name])
def params_2_args_options(self, **params):
"""