diff options
| -rw-r--r-- | ipalib/plugins/example.py | 24 | ||||
| -rw-r--r-- | ipalib/public.py | 16 | ||||
| -rw-r--r-- | ipalib/tests/test_public.py | 8 |
3 files changed, 24 insertions, 24 deletions
diff --git a/ipalib/plugins/example.py b/ipalib/plugins/example.py index 8a89ca436..30f0a70fa 100644 --- a/ipalib/plugins/example.py +++ b/ipalib/plugins/example.py @@ -37,19 +37,19 @@ api.register(discover) # Register some methods for the 'user' object: -class user_add(public.mthd): +class user_add(public.Method): 'Add new user' api.register(user_add) -class user_del(public.mthd): +class user_del(public.Method): 'Delete existing user' api.register(user_del) -class user_mod(public.mthd): +class user_mod(public.Method): 'Edit existing user' api.register(user_mod) -class user_find(public.mthd): +class user_find(public.Method): 'Search for users' api.register(user_find) @@ -89,37 +89,37 @@ api.register(user_initials) # Register some methods for the 'group' object: -class group_add(public.mthd): +class group_add(public.Method): 'Add new group' api.register(group_add) -class group_del(public.mthd): +class group_del(public.Method): 'Delete existing group' api.register(group_del) -class group_mod(public.mthd): +class group_mod(public.Method): 'Edit existing group' api.register(group_mod) -class group_find(public.mthd): +class group_find(public.Method): 'Search for groups' api.register(group_find) # Register some methods for the 'service' object -class service_add(public.mthd): +class service_add(public.Method): 'Add new service' api.register(service_add) -class service_del(public.mthd): +class service_del(public.Method): 'Delete existing service' api.register(service_del) -class service_mod(public.mthd): +class service_mod(public.Method): 'Edit existing service' api.register(service_mod) -class service_find(public.mthd): +class service_find(public.Method): 'Search for services' api.register(service_find) diff --git a/ipalib/public.py b/ipalib/public.py index 19a678fb5..1c51df494 100644 --- a/ipalib/public.py +++ b/ipalib/public.py @@ -251,15 +251,15 @@ class Command(plugable.Plugin): class obj(plugable.Plugin): __public__ = frozenset(( - 'mthd', + 'Method', 'prop', )) - __mthd = None + __Method = None __prop = None - def __get_mthd(self): - return self.__mthd - mthd = property(__get_mthd) + def __get_Method(self): + return self.__Method + Method = property(__get_Method) def __get_prop(self): return self.__prop @@ -267,7 +267,7 @@ class obj(plugable.Plugin): def finalize(self, api): super(obj, self).finalize(api) - self.__mthd = self.__create_ns('mthd') + self.__Method = self.__create_ns('Method') self.__prop = self.__create_ns('prop') def __create_ns(self, name): @@ -315,7 +315,7 @@ class attr(plugable.Plugin): self.__obj = api.obj[self.obj_name] -class mthd(attr, Command): +class Method(attr, Command): __public__ = attr.__public__.union(Command.__public__) def get_options(self): @@ -335,4 +335,4 @@ class prop(attr, option): class PublicAPI(plugable.API): def __init__(self): - super(PublicAPI, self).__init__(Command, obj, mthd, prop) + super(PublicAPI, self).__init__(Command, obj, Method, prop) diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py index 1a496a16a..089fcfe90 100644 --- a/ipalib/tests/test_public.py +++ b/ipalib/tests/test_public.py @@ -350,11 +350,11 @@ def test_attr(): o = example_prop0() -class test_mthd(ClassChecker): +class test_Method(ClassChecker): """ - Tests the `public.mthd` class. + Tests the `public.Method` class. """ - _cls = public.mthd + _cls = public.Method def test_class(self): assert self.cls.__bases__ == (public.attr, public.Command) @@ -390,7 +390,7 @@ class test_mthd(ClassChecker): def test_get_options(self): """ - Tests the `public.mthd.get_options` method. + Tests the `public.Method.get_options` method. """ sub = self.subcls() names = ('option0', 'option1', 'prop0', 'prop1') |