Merge the Pycon 2010 sprint branch replacing lazr.restful with restish as the

underlying REST framework.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/mailman/bin/mailman.py b/src/mailman/bin/mailman.py
index 2bec7a1d4..e8e9f38ac 100644
--- a/src/mailman/bin/mailman.py
+++ b/src/mailman/bin/mailman.py
@@ -47,8 +47,11 @@ def main():
         Copyright 1998-2010 by the Free Software Foundation, Inc.
         http://www.list.org
         """),
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        version=MAILMAN_VERSION_FULL)
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument(
+        '-v', '--version',
+        action='version', version=MAILMAN_VERSION_FULL,
+        help=_('Print this version string and exit'))
     parser.add_argument(
         '-C', '--config',
         help=_("""\
diff --git a/src/mailman/bin/qrunner.py b/src/mailman/bin/qrunner.py
index 7f5f321f5..d75eea4e5 100644
--- a/src/mailman/bin/qrunner.py
+++ b/src/mailman/bin/qrunner.py
@@ -28,6 +28,7 @@ __all__ = [
 import sys
 import signal
 import logging
+import traceback
 
 from mailman.config import config
 from mailman.core.i18n import _
@@ -154,8 +155,8 @@ def make_qrunner(name, slice, range, once=False):
         if config.options.options.subproc:
             # Exit with SIGTERM exit code so the master watcher won't try to
             # restart us.
-            print >> sys.stderr, _('Cannot import runner module: $module_name')
-            print >> sys.stderr, error
+            print >> sys.stderr, _('Cannot import runner module: $class_path')
+            traceback.print_exc()
             sys.exit(signal.SIGTERM)
         else:
             raise