From 13a3de7442570c47da2ccc76c15a0e6b0d9edea1 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Wed, 13 Aug 2008 01:03:32 +0000 Subject: 130: Renamed startup.py to load_plugins.py --- ipa | 3 ++- ipalib/load_plugins.py | 27 +++++++++++++++++++++++++++ ipalib/startup.py | 29 ----------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 ipalib/load_plugins.py delete mode 100644 ipalib/startup.py diff --git a/ipa b/ipa index c7168bfe9..e9089d97e 100755 --- a/ipa +++ b/ipa @@ -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/load_plugins.py b/ipalib/load_plugins.py new file mode 100644 index 000000000..a477ba253 --- /dev/null +++ b/ipalib/load_plugins.py @@ -0,0 +1,27 @@ +# Authors: +# Jason Gerard DeRose +# +# Copyright (C) 2008 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 only +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +""" +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. +""" + +import Plugins diff --git a/ipalib/startup.py b/ipalib/startup.py deleted file mode 100644 index 305295c71..000000000 --- a/ipalib/startup.py +++ /dev/null @@ -1,29 +0,0 @@ -# Authors: -# Jason Gerard DeRose -# -# Copyright (C) 2008 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 only -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# 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. - -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 -- cgit