changeset 1133:db56bd53fc32

cleanup plugin related code / attributes, remove unused stuff
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 07 Aug 2006 00:26:01 +0200
parents f9d8b80f5afb
children 432c676186ba 301575ccf95f
files MoinMoin/action/__init__.py MoinMoin/converter/__init__.py MoinMoin/filter/__init__.py MoinMoin/logfile/__init__.py MoinMoin/macro/SystemInfo.py MoinMoin/macro/__init__.py MoinMoin/parser/__init__.py MoinMoin/script/__init__.py
diffstat 8 files changed, 6 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/action/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -30,8 +30,7 @@
 from MoinMoin.Page import Page
 
 # create a list of extension actions from the package directory
-extension_actions = pysupport.getPackageModules(__file__)
-modules = extension_actions
+modules = pysupport.getPackageModules(__file__)
 
 # builtin-stuff (see do_<name> below):
 names = ['show', 'recall', 'raw', 'format', 'content', 'print', 'refresh', 'goto', 'userform', ]
--- a/MoinMoin/converter/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/converter/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -6,8 +6,3 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-from MoinMoin.util import pysupport
-
-# create a list of extension converters from the subpackage directory
-extension_converters = pysupport.getPackageModules(__file__)
-modules = extension_converters
--- a/MoinMoin/filter/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/filter/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -9,8 +9,7 @@
 import os
 from MoinMoin.util import pysupport
 
-filters = pysupport.getPackageModules(__file__)
-modules = filters
+modules = pysupport.getPackageModules(__file__)
 
 standard_codings = ['utf-8', 'iso-8859-15', 'iso-8859-1', ]
 
--- a/MoinMoin/logfile/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/logfile/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -6,10 +6,6 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-from MoinMoin.util import pysupport
-
-logfiles = pysupport.getPackageModules(__file__)
-
 import os, codecs, errno
 from MoinMoin import config, wikiutil
 
--- a/MoinMoin/macro/SystemInfo.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/macro/SystemInfo.py	Mon Aug 07 00:26:01 2006 +0200
@@ -97,11 +97,11 @@
     nonestr = _("NONE")
     row('Event log', _formatInReadableUnits(eventlogger.size()))
 
-    row(_('Global extension macros'), ', '.join(macro.extension_macros) or nonestr)
+    row(_('Global extension macros'), ', '.join(macro.modules) or nonestr)
     row(_('Local extension macros'),
         ', '.join(wikiutil.wikiPlugins('macro', Macro.cfg)) or nonestr)
 
-    glob_actions = [x for x in action.extension_actions
+    glob_actions = [x for x in action.modules
                     if not x in request.cfg.actions_excluded]
     row(_('Global extension actions'), ', '.join(glob_actions) or nonestr)
     loc_actions = [x for x in wikiutil.wikiPlugins('action', Macro.cfg)
--- a/MoinMoin/macro/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/macro/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -17,9 +17,7 @@
 """
 
 from MoinMoin.util import pysupport
-
-extension_macros = pysupport.getPackageModules(__file__)
-modules = extension_macros
+modules = pysupport.getPackageModules(__file__)
 
 import re, time, os
 from MoinMoin import action, config, util
--- a/MoinMoin/parser/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/parser/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -9,5 +9,5 @@
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.util import pysupport
+modules = pysupport.getPackageModules(__file__)
 
-modules = pysupport.getPackageModules(__file__)
--- a/MoinMoin/script/__init__.py	Sun Aug 06 23:42:36 2006 +0200
+++ b/MoinMoin/script/__init__.py	Mon Aug 07 00:26:01 2006 +0200
@@ -7,12 +7,6 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-from MoinMoin.util import pysupport
-
-# create a list of extension scripts from the subpackage directory
-extension_scripts = pysupport.getPackageModules(__file__)
-modules = extension_scripts
-
 import os, sys, time
 
 flag_quiet = 0