From 481f8ddaa32795c64275438645e45d2c4bbbae26 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 15 Jun 2015 11:02:07 +0000 Subject: plugable: Specify plugins to import in API by module names This change removes the automatic plugins sub-package magic and allows specifying modules in addition to packages. https://fedorahosted.org/freeipa/ticket/3090 Reviewed-By: Martin Babinsky --- ipalib/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipalib/__init__.py') diff --git a/ipalib/__init__.py b/ipalib/__init__.py index cc1492570..74a812033 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -900,15 +900,15 @@ else: class API(plugable.API): def __init__(self, allowed): - super(API, self).__init__(allowed, ['ipalib']) + super(API, self).__init__(allowed, ['ipalib.plugins.*']) def bootstrap(self, parser=None, **overrides): super(API, self).bootstrap(parser, **overrides) if self.env.in_server: - self.packages.append('ipaserver') + self.modules.append('ipaserver.plugins.*') if self.env.context in ('installer', 'updates'): - self.packages.append('ipaserver/install/plugins') + self.modules.append('ipaserver.install.plugins.*') def create_api(mode='dummy'): -- cgit