9 files changed, 8 insertions, 21 deletions
diff --git a/mailman/bin/export.py b/mailman/bin/export.py
index f0bd28da0..d1992b4b4 100644
--- a/mailman/bin/export.py
+++ b/mailman/bin/export.py
@@ -17,11 +17,7 @@
 
 """Export an XML representation of a mailing list."""
 
-import os
-import re
-import sha
 import sys
-import base64
 import codecs
 import datetime
 import optparse
@@ -260,7 +256,7 @@ class XMLDumper(object):
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %prog [options]
 
diff --git a/mailman/bin/genaliases.py b/mailman/bin/genaliases.py
index 3fbef0f88..786069417 100644
--- a/mailman/bin/genaliases.py
+++ b/mailman/bin/genaliases.py
@@ -21,13 +21,9 @@ __all__ = [
     ]
 
 
-import sys
-
-from mailman.config import config
 from mailman.core.plugins import get_plugin
 from mailman.i18n import _
 from mailman.options import Options
-from mailman.version import MAILMAN_VERSION
 
 
 
diff --git a/mailman/bin/list_lists.py b/mailman/bin/list_lists.py
index d2aed3c01..ea1640910 100644
--- a/mailman/bin/list_lists.py
+++ b/mailman/bin/list_lists.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-from mailman import Defaults
 from mailman.config import config
 from mailman.i18n import _
 from mailman.options import Options
@@ -23,7 +22,7 @@ from mailman.options import Options
 
 
 class ScriptOptions(Options):
-    usage=_("""\
+    usage = _("""\
 %prog [options]
 
 List all mailing lists.""")
diff --git a/mailman/bin/list_members.py b/mailman/bin/list_members.py
index b969eecf7..443f764d6 100644
--- a/mailman/bin/list_members.py
+++ b/mailman/bin/list_members.py
@@ -41,7 +41,7 @@ KINDCHOICES = set(('mime', 'plain', 'any'))
 
 
 class ScriptOptions(SingleMailingListOptions):
-    usage=_("""\
+    usage = _("""\
 %prog [options]
 
 List all the members of a mailing list.  Note that with the options below, if
@@ -143,7 +143,7 @@ def main():
     fqdn_listname = options.options.listname
     if options.options.output:
         try:
-            fp = open(opts.output, 'w')
+            fp = open(options.output, 'w')
         except IOError:
             options.parser.error(
                 _('Could not open file for writing: $options.options.output'))
diff --git a/mailman/bin/qrunner.py b/mailman/bin/qrunner.py
index eeb5c286b..62e943aad 100644
--- a/mailman/bin/qrunner.py
+++ b/mailman/bin/qrunner.py
@@ -55,7 +55,7 @@ def r_callback(option, opt, value, parser):
 
 class ScriptOptions(Options):
 
-    usage=_("""\
+    usage = _("""\
 Run one or more qrunners, once or repeatedly.
 
 Each named runner class is run in round-robin fashion.  In other words, the
diff --git a/mailman/bin/remove_list.py b/mailman/bin/remove_list.py
index 57e41c3b3..05211b200 100644
--- a/mailman/bin/remove_list.py
+++ b/mailman/bin/remove_list.py
@@ -15,11 +15,8 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import sys
-import shutil
 
-from mailman import Utils
 from mailman.app.lifecycle import remove_list
 from mailman.config import config
 from mailman.i18n import _
@@ -28,7 +25,7 @@ from mailman.options import MultipleMailingListOptions
 
 
 class ScriptOptions(MultipleMailingListOptions):
-    usage=_("""\
+    usage = _("""\
 %prog [options]
 
 Remove the components of a mailing list with impunity - beware!
diff --git a/mailman/bin/show_qfiles.py b/mailman/bin/show_qfiles.py
index 08697a54e..3f27ae271 100644
--- a/mailman/bin/show_qfiles.py
+++ b/mailman/bin/show_qfiles.py
@@ -26,7 +26,7 @@ from mailman.version import MAILMAN_VERSION
 
 
 def parseargs():
-    parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
+    parser = optparse.OptionParser(version=MAILMAN_VERSION,
                                    usage=_("""\
 %%prog [options] qfiles ...
 
diff --git a/mailman/bin/unshunt.py b/mailman/bin/unshunt.py
index 97369ab17..fc889377c 100644
--- a/mailman/bin/unshunt.py
+++ b/mailman/bin/unshunt.py
@@ -25,7 +25,6 @@ import sys
 
 from mailman.config import config
 from mailman.i18n import _
-from mailman.version import MAILMAN_VERSION
 from mailman.options import Options
 
 
diff --git a/mailman/bin/withlist.py b/mailman/bin/withlist.py
index f180f5525..8f2d8a2b5 100644
--- a/mailman/bin/withlist.py
+++ b/mailman/bin/withlist.py
@@ -151,7 +151,7 @@ the results."""))
 
 
 def main():
-    global LAST_MLIST, VERBOSE
+    global VERBOSE
 
     parser, opts, args = parseargs()
     config_file = (os.getenv('MAILMAN_CONFIG_FILE')