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

Timestamp:

05/02/08 16:47:16 (23 months ago)

Author:

JensDiemer

Message:

update preferences:

• move the preferences form from the plugin module into the plugin config modul
• a plugin must not use try...except to get the preferences
• update all modules around the plugin install/deinstall etc.
• detect_page used the system_settings "index_page" value (setup a other default index page works!)

Files:

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

trunk/pylucid/PyLucid/system/plugin_import.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
-
 """
     PyLucid Plugin Manager
@@ -52 +51 @@
         page_msg(getattr(plugin_config, item))
 
-def get_plugin_config(request, package_name, plugin_name,
-                            dissolve_version_string=False, extra_verbose=False):
+def get_plugin_config(package_name, plugin_name, debug, extra_verbose=False):
     """
     imports the plugin and the config plugin and returns a merge config-object
@@ -61 +59 @@
     """
     config_name = "%s_cfg" % plugin_name
-    debug = request.user.is_superuser or request.debug
+    from_name = ".".join([package_name, plugin_name, config_name])
+    if extra_verbose:
+        print "from %s import %s" % (from_name, config_name)
 
-    def get_plugin(object_name):
-        from_name = ".".join([package_name, plugin_name, object_name])
-        if extra_verbose:
-            print "from %s import %s" % (from_name, object_name)
-        return _import(from_name, object_name, debug)
-
-    config_plugin = get_plugin(config_name)
-
-    if dissolve_version_string:
-        plugin_plugin = get_plugin(plugin_name)
-
-        plugin_version = getattr(plugin_plugin, "__version__", None)
-        if plugin_version:
-            # Cleanup a SVN Revision Number
-            plugin_version = plugin_version.strip("$ ")
-        config_plugin.__version__ = plugin_version
+    config_plugin = _import(from_name, config_name, debug)
 
     return config_plugin
+
+def get_plugin_version(package_name, plugin_name, debug):
+    plugin_plugin = get_plugin_module(package_name, plugin_name, debug)
+
+    plugin_version = getattr(plugin_plugin, "__version__", "")
+
+    # Cleanup a SVN Revision Number
+    plugin_version = plugin_version.strip("$ ")
+
+    return plugin_version
 
 
@@ -87 +82 @@
 
 
-
-