Reorganize the qrunner infrastructure. First, the package has been renamed

from Mailman.Queue to Mailman.queue (note the case change to be more PEP 8
compliant).

The Switchboard and Runner classes have been moved into the package
__init__.py and the previous class modules have been removed.

The switchboard cache is removed; I don't think it was ultimately buying us
much.  Now, just import the Switchboard class and instantiate it directly.

Added an IRunner interface.

Renamed the ArchRunner to ArchiveRunner.

bin/qrunner and bin/mailmanctl are updated accordingly.  For the former, it no
long accepts -r=All to run all qrunners.  You can still use the short name
(e.g. --runner=incoming) to run the built-in queue runners, but this design
will eventually allow for plugin qrunners by allowing them to be run
specifying the full package path to the class.  It also now accepts a leading
dot to indicate a qrunner class relative to the Mailman.queue package.

1 files changed, 2 insertions, 2 deletions

diff --git a/Mailman/Handlers/MimeDel.py b/Mailman/Handlers/MimeDel.py
index 5f49f4b33..93349cb23 100644
--- a/Mailman/Handlers/MimeDel.py
+++ b/Mailman/Handlers/MimeDel.py
@@ -34,11 +34,11 @@ from os.path import splitext
 
 from Mailman import Errors
 from Mailman.Message import UserNotification
-from Mailman.Queue.sbcache import get_switchboard
 from Mailman.Utils import oneline
 from Mailman.Version import VERSION
 from Mailman.configuration import config
 from Mailman.i18n import _
+from Mailman.queue import Switchboard
 
 log = logging.getLogger('mailman.error')
 
@@ -240,7 +240,7 @@ are receiving the only remaining copy of the discarded message.
             subject=_('Content filtered message notification'))
     if mlist.filter_action == 3 and \
            config.OWNERS_CAN_PRESERVE_FILTERED_MESSAGES:
-        badq = get_switchboard(config.BADQUEUE_DIR)
+        badq = Switchboard(config.BADQUEUE_DIR)
         badq.enqueue(msg, msgdata)
     # Most cases also discard the message
     raise Errors.DiscardMessage