From f18c84444d4ed87d79f3cb41156c6b66f49ccac3 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 31 Oct 2008 17:02:51 -0400 Subject: Partially revert back change. Del shouldn't provide default options. It can provide custom ones though, if defined with takes_params() in the class. --- ipalib/crud.py | 2 -- tests/test_ipalib/test_crud.py | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ipalib/crud.py b/ipalib/crud.py index 60c605dd..867f9fe1 100644 --- a/ipalib/crud.py +++ b/ipalib/crud.py @@ -47,8 +47,6 @@ class Del(frontend.Method): yield self.obj.primary_key def get_options(self): - for param in self.obj.params_minus_pk(): - yield param for option in self.takes_options: yield option diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py index 259bc60d..ad391e2e 100644 --- a/tests/test_ipalib/test_crud.py +++ b/tests/test_ipalib/test_crud.py @@ -130,9 +130,8 @@ class test_Del(CrudChecker): Test the `ipalib.crud.Del.get_options` method. """ api = self.get_api() - assert list(api.Method.user_verb.options) == \ - ['givenname', 'sn', 'initials'] - assert len(api.Method.user_verb.options) == 3 + assert list(api.Method.user_verb.options) == [] + assert len(api.Method.user_verb.options) == 0 class test_Mod(CrudChecker): -- cgit