From ba0a1c6b33e2519a48754602413c8379fb1f0ff1 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Fri, 5 Jun 2015 15:11:54 +0200 Subject: include more information in metadata added to commands: doc, proper args, NO_CLI added to options: default_from, cli_name, cli_short_name and others https://fedorahosted.org/freeipa/ticket/3129 Reviewed-By: Martin Kosek Reviewed-By: Tomas Babej --- ipalib/plugins/baseldap.py | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'ipalib/plugins/baseldap.py') diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 2309bbc00..36a5d5f49 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -1299,17 +1299,6 @@ class LDAPCreate(BaseLDAPCommand, crud.Create): def interactive_prompt_callback(self, kw): return - # list of attributes we want exported to JSON - json_friendly_attributes = ( - 'takes_args', - ) - - def __json__(self): - json_dict = dict( - (a, getattr(self, a)) for a in self.json_friendly_attributes - ) - json_dict['takes_options'] = list(self.get_json_options()) - return json_dict class LDAPQuery(BaseLDAPCommand, crud.PKQuery): """ @@ -1321,17 +1310,6 @@ class LDAPQuery(BaseLDAPCommand, crud.PKQuery): for arg in super(LDAPQuery, self).get_args(): yield arg - # list of attributes we want exported to JSON - json_friendly_attributes = ( - 'takes_args', - ) - - def __json__(self): - json_dict = dict( - (a, getattr(self, a)) for a in self.json_friendly_attributes - ) - json_dict['takes_options'] = list(self.get_json_options()) - return json_dict class LDAPMultiQuery(LDAPQuery): """ @@ -2131,17 +2109,6 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): def interactive_prompt_callback(self, kw): return - # list of attributes we want exported to JSON - json_friendly_attributes = ( - 'takes_args', - ) - - def __json__(self): - json_dict = dict( - (a, getattr(self, a)) for a in self.json_friendly_attributes - ) - json_dict['takes_options'] = list(self.get_json_options()) - return json_dict class LDAPModReverseMember(LDAPQuery): """ -- cgit