-m/--manager now defaults to auto-select.

diff --git a/pysawsim/sawsim.py b/pysawsim/sawsim.py
index ccac6f3308da100724ed7d97e0dd1eb7529f33ea..4f34da89c540ee4b44d824ce7cb8a8603d0c64a3 100644 (file)
--- a/pysawsim/sawsim.py
+++ b/pysawsim/sawsim.py
@@ -61,8 +61,7 @@ Event = namedtuple(
 
 class SawsimRunner (object):
     """
 
 class SawsimRunner (object):
     """

-    >>> from .manager.thread import ThreadManager
-    >>> m = ThreadManager()
+    >>> m = get_manager()()

     >>> sr = SawsimRunner(sawsim='bin/sawsim', manager=m)
     >>> for run in sr(param_string=DEFAULT_PARAM_STRING, N=2):
     ...     print 'New run'
     >>> sr = SawsimRunner(sawsim='bin/sawsim', manager=m)
     >>> for run in sr(param_string=DEFAULT_PARAM_STRING, N=2):
     ...     print 'New run'


@@ -104,9 +103,9 @@ class SawsimRunner (object):
                default=400),
         Option('-m', '--manager', dest='manager',
                metavar='STRING',
                default=400),
         Option('-m', '--manager', dest='manager',
                metavar='STRING',

-               help='Job manager name (one of %s) (%%default).'
+               help='Job manager name (one of %s) (default: auto-select).'

                % (', '.join(MANAGERS)),
                % (', '.join(MANAGERS)),

-               default=MANAGERS[0]),
+               default=None),

         Option('-C','--use-cache', dest='use_cache',
                help='Use cached simulations if they exist (vs. running new simulations) (%default)',
                default=False, action='store_true'),
         Option('-C','--use-cache', dest='use_cache',
                help='Use cached simulations if they exist (vs. running new simulations) (%default)',
                default=False, action='store_true'),