Merge lp:~sumanah/mailman/mailman into lp:mailman

[Sumana Harihareswara]

ScriptOptions removal to fix bug #1191796

[Sumana Harihareswara (sumanah)]

Barry mentioned in IRC that he's thinking of making some large refactor-style changes to this area of the code anyway.....

[lp:~sumanah/mailman/mailman]

7275. By Sumana Harihareswara on 2014-12-31

merged in master

7276. By Sumana Harihareswara on 2015-01-08

merge from master

7277. By Sumana Harihareswara on 2015-04-20

fixing comma

7278. By Sumana Harihareswara on 2015-04-20

merge

[Barry Warsaw (barry)]

Hi Sumana. I've ported this over to the git repo, done some refactoring and other cleanups. Thanks for the heads start!

review: Approve

=== modified file 'src/mailman/bin/master.py'
--- src/mailman/bin/master.py	2015-03-12 16:20:52 +0000
+++ src/mailman/bin/master.py	2015-04-20 01:29:57 +0000
@@ -46,66 +46,6 @@
 SUBPROC_START_WAIT = timedelta(seconds=20)
 
 
-
 
-class ScriptOptions(Options):
-    """Options for the master watcher."""
-
-    usage = _("""\
-%prog [options]
-
-Master subprocess watcher.
-
-Start and watch the configured runners and ensure that they stay alive and
-kicking.  Each runner is forked and exec'd in turn, with the master waiting on
-their process ids.  When it detects a child runner has exited, it may restart
-it.
-
-The runners respond to SIGINT, SIGTERM, SIGUSR1 and SIGHUP.  SIGINT, SIGTERM
-and SIGUSR1 all cause a runner to exit cleanly.  The master will restart
-runners that have exited due to a SIGUSR1 or some kind of other exit condition
-(say because of an uncaught exception).  SIGHUP causes the master and the
-runners to close their log files, and reopen then upon the next printed
-message.
-
-The master also responds to SIGINT, SIGTERM, SIGUSR1 and SIGHUP, which it
-simply passes on to the runners.  Note that the master will close and reopen
-its own log files on receipt of a SIGHUP.  The master also leaves its own
-process id in the file `data/master.pid` but you normally don't need to use
-this pid directly.""")
-
-    def add_options(self):
-        """See `Options`."""
-        self.parser.add_option(
-            '-n', '--no-restart',
-            dest='restartable', default=True, action='store_false',
-            help=_("""\
-Don't restart the runners when they exit because of an error or a SIGUSR1.
-Use this only for debugging."""))
-        self.parser.add_option(
-            '-f', '--force',
-            default=False, action='store_true',
-            help=_("""\
-If the master watcher finds an existing master lock, it will normally exit
-with an error message.  With this option,the master will perform an extra
-level of checking.  If a process matching the host/pid described in the lock
-file is running, the master will still exit, requiring you to manually clean
-up the lock.  But if no matching process is found, the master will remove the
-apparently stale lock and make another attempt to claim the master lock."""))
-        self.parser.add_option(
-            '-r', '--runner',
-            dest='runners', action='append', default=[],
-            help=_("""\
-Override the default set of runners that the master will invoke, which is
-typically defined in the configuration file.  Multiple -r options may be
-given.  The values for -r are passed straight through to bin/runner."""))
-
-    def sanity_check(self):
-        """See `Options`."""
-        if len(self.arguments) > 0:
-            self.parser.error(_('Too many arguments'))
-
-
-
 
 class WatcherState(Enum):
     """Enum for the state of the master process watcher."""
     # No lock has been acquired by any process.
@@ -520,7 +460,7 @@
 def main():
     """Main process."""
 
-    options = ScriptOptions()
+    options = Options()
     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
 
=== modified file 'src/mailman/bin/onebounce.py'
--- src/mailman/bin/onebounce.py	2015-01-05 01:22:39 +0000
+++ src/mailman/bin/onebounce.py	2015-04-20 01:29:57 +0000
@@ -28,42 +28,10 @@
 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 = Options()
     options.initialize()
 
     if options.options.list:
 
=== modified file 'src/mailman/commands/cli_control.py'
--- src/mailman/commands/cli_control.py	2015-01-20 19:53:16 +0000
+++ src/mailman/commands/cli_control.py	2015-04-20 01:29:57 +0000
@@ -56,7 +56,7 @@
             default=False, action='store_true',
             help=_("""\
             If the master watcher finds an existing master lock, it will
-            normally exit with an error message.  With this option,the master
+            normally exit with an error message.  With this option, the master
             will perform an extra level of checking.  If a process matching
             the host/pid described in the lock file is running, the master
             will still exit, requiring you to manually clean up the lock.  But