changeset 85:0944980db255

remove data/plugin/ directory and code using this
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 07 Mar 2011 01:39:17 +0100
parents 2f9b41699a7f
children abfe2018f17c
files MoinMoin/config/default.py MoinMoin/util/plugins.py wiki/data/plugin/__init__.py
diffstat 3 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/default.py	Sun Mar 06 23:49:33 2011 +0100
+++ b/MoinMoin/config/default.py	Mon Mar 07 01:39:17 2011 +0100
@@ -57,8 +57,6 @@
         # define directories
         data_dir = os.path.normpath(self.data_dir)
         self.data_dir = data_dir
-        if not getattr(self, 'plugin_dir', None):
-            setattr(self, 'plugin_dir', os.path.abspath(os.path.join(data_dir, 'plugin')))
 
         # Try to decode certain names which allow unicode
         self._decode()
@@ -382,8 +380,7 @@
   # ==========================================================================
   'data': ('Data storage', None, (
     ('data_dir', './data/', "Path to the data directory."),
-    ('plugin_dir', None, "Plugin directory, by default computed to be `data_dir`/plugin."),
-    ('plugin_dirs', [], "Additional plugin directories."),
+    ('plugin_dirs', [], "Plugin directories."),
 
     ('interwiki_map', {},
      "Dictionary of wiki_name -> wiki_url"),
--- a/MoinMoin/util/plugins.py	Sun Mar 06 23:49:33 2011 +0100
+++ b/MoinMoin/util/plugins.py	Mon Mar 07 01:39:17 2011 +0100
@@ -194,14 +194,13 @@
     Since each configured plugin path has unique plugins, we load the
     plugin packages as "moin_plugin_<sha1(path)>.plugin".
     """
-    plugin_dirs = [cfg.plugin_dir] + cfg.plugin_dirs
     cfg._plugin_modules = []
 
     try:
         # Lock other threads while we check and import
         imp.acquire_lock()
         try:
-            for pdir in plugin_dirs:
+            for pdir in cfg.plugin_dirs:
                 csum = 'p_%s' % hashlib.new('sha1', pdir).hexdigest()
                 modname = '%s.%s' % (cfg.siteid, csum)
                 # If the module is not loaded, try to load it
--- a/wiki/data/plugin/__init__.py	Sun Mar 06 23:49:33 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# *** Do not remove this! ***
-# Although being empty, the presence of this file is important for plugins
-# working correctly.
-