2 files changed, 6 insertions, 6 deletions

diff --git a/Mailman/bin/change_pw.py b/Mailman/bin/change_pw.py
index 00c555d9b..afa932160 100644
--- a/Mailman/bin/change_pw.py
+++ b/Mailman/bin/change_pw.py
@@ -54,7 +54,7 @@ Thus, this script generates new passwords for a list, and optionally sends it
 to all the owners of the list."""))
     parser.add_option('-a', '--all',
                       default=False, action='store_true',
-                      help_('Change the password for all lists'))
+                      help=_('Change the password for all lists'))
     parser.add_option('-d', '--domain',
                       default=[], type='string', action='append',
                       dest='domains', help=_("""\
@@ -127,7 +127,7 @@ def main():
 
     # Set the password on the lists
     if opts.password:
-        shapassword = sha.new(password).hexdigest()
+        shapassword = sha.new(opts.password).hexdigest()
 
     for listname in listnames:
         mlist = openlist(listname)
@@ -139,7 +139,7 @@ def main():
                 shapassword = sha.new(randompw).hexdigest()
                 notifypassword = randompw
             else:
-                notifypassword = password
+                notifypassword = opts.password
 
             mlist.password = shapassword
             mlist.Save()
@@ -148,7 +148,7 @@ def main():
 
         # Notification
         print _('New $listname password: $notifypassword')
-        if not quiet:
+        if not opts.quiet:
             otrans = i18n.get_translation()
             i18n.set_language(mlist.preferred_language)
             try:
diff --git a/Mailman/bin/show_qfiles.py b/Mailman/bin/show_qfiles.py
index f2ec819c1..f49190b1d 100644
--- a/Mailman/bin/show_qfiles.py
+++ b/Mailman/bin/show_qfiles.py
@@ -19,6 +19,7 @@ import sys
 import optparse
 from cPickle import load
 
+from Mailman import mm_cfg
 from Mailman.i18n import _
 
 __i18_templates__ = True
@@ -36,7 +37,6 @@ Show the contents of one or more Mailman queue files."""))
                       help=_("Don't print 'helpful' message delimiters."))
     opts, args = parser.parse_args()
     return parser, opts, args
-    
 
 
 
@@ -44,7 +44,7 @@ def main():
     parser, opts, args = parseargs()
 
     for filename in args:
-        if not quiet:
+        if not opts.quiet:
             print '====================>', filename
         fp = open(filename)
         if filename.endswith(".pck"):