From e9b715f2c430940d94bfedd6dbf9b1010eb22ffc Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Wed, 13 Aug 2008 00:56:46 +0000 Subject: [PATCH] 128: Fixed startup.py, example.py to work with new plugin locations --- ipalib/Plugins/__init__.py | 2 +- ipalib/Plugins/example.py | 5 +++-- ipalib/startup.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ipalib/Plugins/__init__.py b/ipalib/Plugins/__init__.py index e63256490..743eedb99 100644 --- a/ipalib/Plugins/__init__.py +++ b/ipalib/Plugins/__init__.py @@ -21,4 +21,4 @@ Sub-package containing all internal plugins. """ -print 'imported Plugins' +import example diff --git a/ipalib/Plugins/example.py b/ipalib/Plugins/example.py index c8eede0b2..49b3d49c4 100644 --- a/ipalib/Plugins/example.py +++ b/ipalib/Plugins/example.py @@ -21,8 +21,9 @@ Some example plugins. """ -import public -from run import api + +from ipalib import public +from ipalib.run import api # Hypothetical functional commands (not associated with any object): diff --git a/ipalib/startup.py b/ipalib/startup.py index 4879a8e67..305295c71 100644 --- a/ipalib/startup.py +++ b/ipalib/startup.py @@ -21,9 +21,9 @@ Importing this module causes the plugins to be loaded and the API to be generated. -This is not in __init__.py so that imported other IPA modules doesn't cause +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). """ from run import api -import plugins +import Plugins