Changeset 1548 for trunk/pylucid/PyLucid/system/plugin_import.py

Timestamp:

05/01/08 12:24:21 (23 months ago)

Author:

JensDiemer

Message:

put the plugin preferences into the plugin model.
TODO: update detect_page and set system_settings at install.

Files:

• trunk/pylucid/PyLucid/system/plugin_import.py (modified) (5 diffs)

trunk/pylucid/PyLucid/system/plugin_import.py

@@ -21 +21 @@
 
 
-def _import(request, from_name, object_name):
+def _import(from_name, object_name, debug):
     """
     from 'from_name' import 'object_name'
@@ -28 +28 @@
         return __import__(from_name, {}, {}, [object_name])
     except (ImportError, SyntaxError), e:
-        if request.user.is_superuser or request.debug:
+        if debug:
             raise
         raise ImportError, "Can't import %s from %s: %s" % (
@@ -34 +34 @@
         )
 
-def get_plugin_module(request, package_name, plugin_name):
-    plugin_module = _import(request,
+def get_plugin_module(package_name, plugin_name, debug):
+    plugin_module = _import(
         from_name = ".".join([package_name, plugin_name, plugin_name]),
-        object_name = plugin_name
+        object_name = plugin_name,
+        debug = debug,
     )
     return plugin_module
 
-#def get_plugin_class(request, package_name, plugin_name):
-#    """
-#    import the plugin/plugin and returns the class object
-#    """
-#    plugin_module = get_plugin_module(request, package_name, plugin_name)
-#    plugin_class = getattr(plugin_module, plugin_name)
-#    return plugin_class
+#    debug = request.user.is_superuser or request.debug
+
 
 def debug_plugin_config(page_msg, plugin_config):
@@ -65 +61 @@
     """
     config_name = "%s_cfg" % plugin_name
+    debug = request.user.is_superuser or request.debug
 
     def get_plugin(object_name):
@@ -70 +67 @@
         if extra_verbose:
             print "from %s import %s" % (from_name, object_name)
-        return _import(request, from_name, object_name)
+        return _import(from_name, object_name, debug)
 
     config_plugin = get_plugin(config_name)