diff options
| -rw-r--r-- | ipalib/plugable.py | 8 | ||||
| -rw-r--r-- | tests/test_ipalib/test_plugable.py | 19 |
2 files changed, 10 insertions, 17 deletions
diff --git a/ipalib/plugable.py b/ipalib/plugable.py index 2bed992d..5363a51e 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -258,17 +258,11 @@ class Plugin(ReadOnly): self.name = cls.__name__ self.module = cls.__module__ self.fullname = '%s.%s' % (self.module, self.name) + self.doc = cls.__doc__ log = logging.getLogger('ipa') for name in ('debug', 'info', 'warning', 'error', 'critical'): setattr(self, name, getattr(log, name)) - def __get_doc(self): - """ - Convenience property to return the class docstring. - """ - return self.__class__.__doc__ - doc = property(__get_doc) - def __get_api(self): """ Return `API` instance passed to `finalize()`. diff --git a/tests/test_ipalib/test_plugable.py b/tests/test_ipalib/test_plugable.py index 00dc5241..02df058b 100644 --- a/tests/test_ipalib/test_plugable.py +++ b/tests/test_ipalib/test_plugable.py @@ -303,7 +303,6 @@ class test_Plugin(ClassChecker): """ assert self.cls.__bases__ == (plugable.ReadOnly,) assert self.cls.__public__ == frozenset() - assert type(self.cls.doc) is property assert type(self.cls.api) is property def test_init(self): @@ -314,20 +313,20 @@ class test_Plugin(ClassChecker): assert o.name == 'Plugin' assert o.module == 'ipalib.plugable' assert o.fullname == 'ipalib.plugable.Plugin' + assert o.doc == self.cls.__doc__ class some_subclass(self.cls): - pass + """ + Do sub-classy things. + + Although it doesn't know how to comport itself and is not for mixed + company, this class *is* useful as we all need a little sub-class + now and then. + """ o = some_subclass() assert o.name == 'some_subclass' assert o.module == __name__ assert o.fullname == '%s.some_subclass' % __name__ - - def test_doc(self): - """ - Test the `ipalib.plugable.Plugin.doc` property. - """ - class some_subclass(self.cls): - 'here is the doc string' - assert read_only(some_subclass(), 'doc') == 'here is the doc string' + assert o.doc == some_subclass.__doc__ def test_implements(self): """ |