improve mm_cfg handler

Author: jaredmauch

Mailman/Queue/IncomingRunner.py

@@ -142,17 +142,16 @@ def _get_pipeline(self, mlist, msg, msgdata):
         pipeline = msgdata.get('pipeline')
         if pipeline is None:
             pipeline = getattr(mlist, 'pipeline', None)
-        if pipeline is None:
+        else:
             # Use the already-imported mm_cfg directly
             pipeline = mm_cfg.GLOBAL_PIPELINE
 
         # Ensure pipeline is a list that can be sliced
         if not isinstance(pipeline, list):
-            syslog('error', 'GLOBAL_PIPELINE is not a list: %s (type: %s)', 
+            syslog('error', 'pipeline is not a list: %s (type: %s)', 
                    pipeline, type(pipeline).__name__)
             # Fallback to a basic pipeline
-            pipeline = ['SpamDetect', 'Approve', 'Moderate', 'Hold', 
-                       'CalcRecips', 'CookHeaders', 'ToOutgoing']
+            pipeline = mm_cfg.GLOBAL_PIPELINE
 
         return pipeline[:]
 

Mailman/htmlformat.py

@@ -650,7 +650,8 @@ def Format(self, indent=0):
 # These are the URLs which the image logos link to.  The Mailman home page now
 # points at the gnu.org site instead of the www.list.org mirror.
 #
-from mm_cfg import MAILMAN_URL
+MAILMAN_URL = Mailman.mm_cfg.MAILMAN_URL
+# from Mailman.mm_cfg import MAILMAN_URL
 PYTHON_URL  = 'http://www.python.org/'
 GNU_URL     = 'http://www.gnu.org/'