Removed depreciated load_plugins.py module; changed all places where load_plugins was imported to now call api.load_plugins()

5 files changed, 7 insertions, 88 deletions

diff --git a/ipa b/ipa
index b202a5d03..9fb302017 100755
--- a/ipa
+++ b/ipa
@@ -28,7 +28,7 @@ The CLI functionality is implemented in ipalib/cli.py
 import sys
 from ipalib import api
 from ipalib.cli import CLI
-import ipalib.load_plugins
+api.load_plugins()
 
 if __name__ == '__main__':
     cli = CLI(api)
diff --git a/ipa_server/mod_python_xmlrpc.py b/ipa_server/mod_python_xmlrpc.py
index 814b1f65e..450f4a514 100644
--- a/ipa_server/mod_python_xmlrpc.py
+++ b/ipa_server/mod_python_xmlrpc.py
@@ -46,11 +46,12 @@ from ipalib import config
 from ipa_server import conn
 from ipa_server.servercore import context
 from ipa_server.servercore import ipautil
-import ipalib.load_plugins
 from ipalib.util import xmlrpc_unmarshal
 
 import string
 
+api.load_plugins()
+
 # Global list of available functions
 gfunctions = {}
 
diff --git a/ipalib/load_plugins.py b/ipalib/load_plugins.py
deleted file mode 100644
index 4e02f5bab..000000000
--- a/ipalib/load_plugins.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# Authors:
-#   Jason Gerard DeRose <jderose@redhat.com>
-#
-# 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 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 os
-from os import path
-import imp
-import inspect
-
-
-def find_modules_in_dir(src_dir):
-    """
-    Iterate through module names found in ``src_dir``.
-    """
-    if not (path.abspath(src_dir) == src_dir and path.isdir(src_dir)):
-        return
-    if path.islink(src_dir):
-        return
-    suffix = '.py'
-    for name in sorted(os.listdir(src_dir)):
-        if not name.endswith(suffix):
-            continue
-        py_file = path.join(src_dir, name)
-        if path.islink(py_file) or not path.isfile(py_file):
-            continue
-        module = name[:-len(suffix)]
-        if module == '__init__':
-            continue
-        yield module
-
-
-def load_plugins_in_dir(src_dir):
-    """
-    Import each Python module found in ``src_dir``.
-    """
-    for module in find_modules_in_dir(src_dir):
-        imp.load_module(module, *imp.find_module(module, [src_dir]))
-
-
-def import_plugins(name):
-    """
-    Load all plugins found in standard 'plugins' sub-package.
-    """
-    try:
-        plugins = __import__(name + '.plugins').plugins
-    except ImportError:
-        return
-    src_dir = path.dirname(path.abspath(plugins.__file__))
-    for name in find_modules_in_dir(src_dir):
-        full_name = '%s.%s' % (plugins.__name__, name)
-        __import__(full_name)
-
-
-for name in ['ipalib', 'ipa_server', 'ipa_not_a_package']:
-    import_plugins(name)
-
-load_plugins_in_dir(path.expanduser('~/.freeipa'))
diff --git a/lite-webui.py b/lite-webui.py
index ccef77ed5..e75e5d9d5 100755
--- a/lite-webui.py
+++ b/lite-webui.py
@@ -27,9 +27,8 @@ from cherrypy import expose, config, quickstart
 from ipa_webui.templates import form, main
 from ipa_webui import controller
 from ipalib import api
-from ipalib import load_plugins
-
 
+api.load_plugins()
 api.finalize()
 
 
@@ -42,5 +41,5 @@ class root(object):
             setattr(self, cmd.name, ctr)
 
 
-if __name__ == '__main__'
+if __name__ == '__main__':
     quickstart(root())
diff --git a/lite-xmlrpc.py b/lite-xmlrpc.py
index 7e9c69a83..b057138c8 100755
--- a/lite-xmlrpc.py
+++ b/lite-xmlrpc.py
@@ -34,11 +34,12 @@ from ipalib import api
 from ipalib import config
 from ipa_server import conn
 from ipa_server.servercore import context
-import ipalib.load_plugins
 from ipalib.util import xmlrpc_unmarshal
 import traceback
 import krbV
 
+api.load_plugins()
+
 
 PORT=8888