More test repairs. Fix a typo in the core mailman.cfg file.

3 files changed, 6 insertions, 13 deletions

diff --git a/mailman/queue/pipeline.py b/mailman/queue/pipeline.py
index 4d4be7790..532e256d1 100644
--- a/mailman/queue/pipeline.py
+++ b/mailman/queue/pipeline.py
@@ -22,15 +22,13 @@ through the 'preparation pipeline'.  This pipeline adds, deletes and modifies
 headers, calculates message recipients, and more.
 """
 
-from mailman.app.pipelines import process
+from mailman.core.pipelines import process
 from mailman.config import config
 from mailman.queue import Runner
 
 
 
 class PipelineRunner(Runner):
-    QDIR = config.PIPELINEQUEUE_DIR
-
     def _dispose(self, mlist, msg, msgdata):
         # Process the message through the mailing list's pipeline.
         process(mlist, msg, msgdata, mlist.pipeline)
diff --git a/mailman/queue/retry.py b/mailman/queue/retry.py
index 03cf86848..d502e3bb9 100644
--- a/mailman/queue/retry.py
+++ b/mailman/queue/retry.py
@@ -18,23 +18,20 @@
 import time
 
 from mailman.config import config
-from mailman.queue import Runner, Switchboard
+from mailman.queue import Runner
 
 
 
 class RetryRunner(Runner):
-    QDIR = config.RETRYQUEUE_DIR
-    SLEEPTIME = config.minutes(15)
-
     def __init__(self, slice=None, numslices=1):
         Runner.__init__(self, slice, numslices)
-        self.__outq = Switchboard(config.OUTQUEUE_DIR)
+        self._outq = config.switchboards['out']
 
     def _dispose(self, mlist, msg, msgdata):
         # Move it to the out queue for another retry
-        self.__outq.enqueue(msg, msgdata)
+        self._outq.enqueue(msg, msgdata)
         return False
 
     def _snooze(self, filecnt):
         # We always want to snooze
-        time.sleep(float(self.SLEEPTIME))
+        time.sleep(self.sleep_float)
diff --git a/mailman/queue/virgin.py b/mailman/queue/virgin.py
index 917d702ca..6d913d1a0 100644
--- a/mailman/queue/virgin.py
+++ b/mailman/queue/virgin.py
@@ -23,15 +23,13 @@ to go through some minimal processing before they can be sent out to the
 recipient.
 """
 
-from mailman.app.pipelines import process
+from mailman.core.pipelines import process
 from mailman.config import config
 from mailman.queue import Runner
 
 
 
 class VirginRunner(Runner):
-    QDIR = config.VIRGINQUEUE_DIR
-
     def _dispose(self, mlist, msg, msgdata):
         # We need to fast track this message through any pipeline handlers
         # that touch it, e.g. especially cook-headers.