From: W. Trevor King <wking@drexel.edu>
Date: Thu, 4 Nov 2010 18:51:39 +0000 (-0400)
Subject: Merge remote branch 'pub/master'
X-Git-Url: http://git.tremily.us/?p=sawsim.git;a=commitdiff_plain;h=e6b9ece8dab59dcadda61ef9509d3ddaf275e5e7;hp=-c

Merge remote branch 'pub/master'
---

e6b9ece8dab59dcadda61ef9509d3ddaf275e5e7
diff --combined pysawsim/parameter_error.py
index c8c20e6,b75b310..f56ba26
--- a/pysawsim/parameter_error.py
+++ b/pysawsim/parameter_error.py
@@@ -80,8 -80,7 +80,7 @@@ def main(argv=None)
      >>> f = tempfile.NamedTemporaryFile()
      >>> f.write(EXAMPLE_HISTOGRAM_FILE_CONTENTS)
      >>> f.flush()
-     >>> main(['-s', 'bin/sawsim',
-     ...       '-r', '[1e-6,1e-4,3]', '--log',
+     >>> main(['-r', '[1e-6,1e-4,3]', '--log',
      ...       '-N', '4', '-t', '0.8',
      ...       f.name])
      ... # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE, +REPORT_UDIFF
@@@ -125,7 -124,6 +124,7 @@@
              'one ends).',
              ])
      parser = OptionParser(usage, epilog=epilog)
 +    parser.format_epilog = lambda formatter: epilog+'\n'
      for option in sr.optparse_options:
          if option.dest == 'param_string':
              continue