diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-08-13 00:56:46 +0000 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-08-13 00:56:46 +0000 |
| commit | e9b715f2c430940d94bfedd6dbf9b1010eb22ffc (patch) | |
| tree | ba2cb509ef3be6a0f1db482c90365692e6c96fba | |
| parent | ba6cb2bf924327a580e1b410924f4f6419a75d16 (diff) | |
| download | freeipa.git-e9b715f2c430940d94bfedd6dbf9b1010eb22ffc.tar.gz freeipa.git-e9b715f2c430940d94bfedd6dbf9b1010eb22ffc.tar.xz freeipa.git-e9b715f2c430940d94bfedd6dbf9b1010eb22ffc.zip | |
128: Fixed startup.py, example.py to work with new plugin locations
| -rw-r--r-- | ipalib/Plugins/__init__.py | 2 | ||||
| -rw-r--r-- | ipalib/Plugins/example.py | 5 | ||||
| -rw-r--r-- | ipalib/startup.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ipalib/Plugins/__init__.py b/ipalib/Plugins/__init__.py index e6325649..743eedb9 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 c8eede0b..49b3d49c 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 4879a8e6..305295c7 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 |