diff options
| -rw-r--r-- | src/mailman/bin/master.py | 6 | ||||
| -rw-r--r-- | src/mailman/bin/onebounce.py | 71 | ||||
| -rw-r--r-- | src/mailman/utilities/options.py (renamed from src/mailman/options.py) | 26 |
3 files changed, 3 insertions, 100 deletions
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py index ebf08ba11..ca7d50883 100644 --- a/src/mailman/bin/master.py +++ b/src/mailman/bin/master.py @@ -37,7 +37,7 @@ from lazr.config import as_boolean from mailman.config import config from mailman.core.i18n import _ from mailman.core.logging import reopen -from mailman.options import Options +from mailman.utilities.options import Options DOT = '.' @@ -53,7 +53,7 @@ PRESERVE_ENVS = ( -class ScriptOptions(Options): +class MasterOptions(Options): """Options for the master watcher.""" usage = _("""\ @@ -526,7 +526,7 @@ Runner {0} reached maximum restart limit of {1:d}, not restarting.""", def main(): """Main process.""" - options = ScriptOptions() + options = MasterOptions() options.initialize() # Acquire the master lock, exiting if we can't. We'll let the caller # handle any clean up or lock breaking. No `with` statement here because diff --git a/src/mailman/bin/onebounce.py b/src/mailman/bin/onebounce.py deleted file mode 100644 index 9130b5c44..000000000 --- a/src/mailman/bin/onebounce.py +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright (C) 2002-2015 by the Free Software Foundation, Inc. -# -# This file is part of GNU Mailman. -# -# GNU Mailman is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# GNU Mailman. If not, see <http://www.gnu.org/licenses/>. - -"""Test bounce detection on message files.""" - - -__all__ = [ - 'main', - ] - - -import sys - -from mailman.core.i18n import _ -from mailman.options import Options - - - -class ScriptOptions(Options): - """Options for onebounce.""" - - usage = _("""\ -%prog [options] - -Test the bounce detection for message files.""") - - def add_options(self): - """See `Options`.""" - self.parser.add_option( - '-a', '--all', - default=False, action='store_true', - help=_("""\ -Run the message through all the registered bounce modules. Normally this -script stops at the first match.""")) - self.parser.add_option( - '-m', '--module', - type='string', help=_(""" -Run the message through just the named bounce module.""")) - self.parser.add_option( - '-l', '--list', - default=False, action='store_true', - help=_('List all available bounce modules and exit.')) - self.parser.add_option( - '-v', '--verbose', - default=False, action='store_true', - help=_('Increase verbosity.')) - - - -def main(): - """bin/onebounce""" - options = ScriptOptions() - options.initialize() - - if options.options.list: - print('list of available bounce modules.') - sys.exit(0) diff --git a/src/mailman/options.py b/src/mailman/utilities/options.py index 44cabd19f..a9cff3b70 100644 --- a/src/mailman/options.py +++ b/src/mailman/utilities/options.py @@ -19,8 +19,6 @@ __all__ = [ 'Options', - 'SingleMailingListOptions', - 'MultipleMailingListOptions', ] @@ -142,27 +140,3 @@ class Options: else self.options.config) initialize(config_file, propagate_logs=propagate_logs) self.sanity_check() - - - -class SingleMailingListOptions(Options): - """A helper for specifying the mailing list on the command line.""" - - def add_options(self): - """See `Options`.""" - self.parser.add_option( - '-l', '--listname', - type='unicode', help=_('The mailing list name')) - super(SingleMailingListOptions, self).add_options() - - -class MultipleMailingListOptions(Options): - """A helper for specifying multiple mailing lists on the command line.""" - - def add_options(self): - """See `Options`.""" - self.parser.add_option( - '-l', '--listname', - default=[], action='append', dest='listnames', type='unicode', - help=_("""\ -A mailing list name. It is okay to have multiple --listname options.""")) |