diff options
-rwxr-xr-x | ipa | 2 | ||||
-rw-r--r-- | ipalib/api.py (renamed from ipalib/run.py) | 3 | ||||
-rw-r--r-- | ipalib/load_plugins.py | 7 | ||||
-rw-r--r-- | ipalib/plugins/example.py | 2 |
4 files changed, 8 insertions, 6 deletions
@@ -26,7 +26,7 @@ Just proof of concept stuff in here right now. """ import sys -from ipalib.run import api +from ipalib.api import api from ipalib.cli import CLI import ipalib.load_plugins diff --git a/ipalib/run.py b/ipalib/api.py index eaaaed9c8..f6820fd9e 100644 --- a/ipalib/run.py +++ b/ipalib/api.py @@ -18,8 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -Standard run-time instances of importard classes. This is where plugins -should access the registration API. +Standard instances of plugable.API and its subclasses. """ import public diff --git a/ipalib/load_plugins.py b/ipalib/load_plugins.py index 5663d0e88..7863a24be 100644 --- a/ipalib/load_plugins.py +++ b/ipalib/load_plugins.py @@ -20,8 +20,11 @@ """ Importing this module causes the plugins to be loaded. -This is not in __init__.py so that importing other ipalib or its other -modules does not cause unnecessary side effects. +This is not in __init__.py so that importing ipalib or its other sub-modules +does not cause unnecessary side effects. + +Eventually this will also load the out-of tree plugins, but for now it just +loads the internal plugins. """ import plugins diff --git a/ipalib/plugins/example.py b/ipalib/plugins/example.py index 49b3d49c4..caf963d2a 100644 --- a/ipalib/plugins/example.py +++ b/ipalib/plugins/example.py @@ -23,7 +23,7 @@ Some example plugins. from ipalib import public -from ipalib.run import api +from ipalib.api import api # Hypothetical functional commands (not associated with any object): |