2 files changed, 5 insertions, 3 deletions
diff --git a/mailman/pipeline/docs/scrubber.txt b/mailman/pipeline/docs/scrubber.txt
index 9c9367cda..eddd1939d 100644
--- a/mailman/pipeline/docs/scrubber.txt
+++ b/mailman/pipeline/docs/scrubber.txt
@@ -50,7 +50,8 @@ filename suggested in the message's Content-Disposition: header or not.  If
 enabled, the filename will be used when this header attribute is present (yes,
 this is an unfortunate double negative).
 
-    >>> config.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = False
+    >>> from mailman import Defaults
+    >>> Defaults.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = False
     >>> msg = message_from_string("""\
     ... Content-Type: image/gif; name="xtest.gif"
     ... Content-Transfer-Encoding: base64
@@ -79,7 +80,7 @@ The site administrator can also configure Mailman to ignore the
 Content-Disposition: filename.  This is the default for reasons described in
 the Defaults.py.in file.
 
-    >>> config.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = True
+    >>> Defaults.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = True
     >>> msg = message_from_string("""\
     ... Content-Type: image/gif; name="xtest.gif"
     ... Content-Transfer-Encoding: base64
diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py
index e8268f0cf..a0e88b7d8 100644
--- a/mailman/pipeline/scrubber.py
+++ b/mailman/pipeline/scrubber.py
@@ -40,6 +40,7 @@ from zope.interface import implements
 
 from mailman import Defaults
 from mailman import Utils
+from mailman.config import config
 from mailman.core.errors import DiscardMessage
 from mailman.core.plugins import get_plugin
 from mailman.i18n import _
@@ -394,7 +395,7 @@ def makedirs(dir):
 
 
 def save_attachment(mlist, msg, dir, filter_html=True):
-    fsdir = os.path.join(Defaults.PRIVATE_ARCHIVE_FILE_DIR,
+    fsdir = os.path.join(config.PRIVATE_ARCHIVE_FILE_DIR,
                          mlist.fqdn_listname, dir)
     makedirs(fsdir)
     # Figure out the attachment type and get the decoded data