diff options
| -rwxr-xr-x | ipa | 3 | ||||
| -rw-r--r-- | ipalib/load_plugins.py (renamed from ipalib/startup.py) | 8 |
2 files changed, 5 insertions, 6 deletions
@@ -26,8 +26,9 @@ Just proof of concept stuff in here right now. """ import sys -from ipalib.startup import api +from ipalib.run import api from ipalib.cli import CLI +import ipalib.load_plugins cli = CLI(api) cli.run() diff --git a/ipalib/startup.py b/ipalib/load_plugins.py index 305295c71..a477ba253 100644 --- a/ipalib/startup.py +++ b/ipalib/load_plugins.py @@ -18,12 +18,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -Importing this module causes the plugins to be loaded and the API to be -generated. +Importing this module causes the plugins to be loaded. -This is not in __init__.py so that importing other IPA modules doesn't cause -unnecessary side effects (needed for unit tests, among other things). +This is not in __init__.py so that importing other ipalib or its other +modules does not cause unnecessary side effects. """ -from run import api import Plugins |