tree 3e084738698a92ee1886e551552e7dffd741f394
parent d56ce975fb99ccc659562397e2218f2f4bd4ba34
author R. David Murray <rdmurray@bitdance.com> 1261330645 +0000
committer R. David Murray <rdmurray@bitdance.com> 1261330645 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4076938

Merged revisions 76937 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

r76934 does not apply and was deleted in the merge.

................
  r76937 | r.david.murray | 2009-12-20 12:28:31 -0500 (Sun, 20 Dec 2009) | 20 lines

  Merged revisions 76934-76935 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76934 | r.david.murray | 2009-12-20 11:24:46 -0500 (Sun, 20 Dec 2009) | 2 lines

    Fix comment typo.
  ........
    r76935 | r.david.murray | 2009-12-20 11:46:06 -0500 (Sun, 20 Dec 2009) | 10 lines

    Issue #7376: When called with no arguments doctest was running a
    self-test.  Because of a change to the way tracebacks are printed,
    this self-test was failing.  The test is run (and passes) during normal
    regression testing.  So instead of running the failing self-test this
    patch makes doctest emit a usage message.  This is better behavior anyway
    since passing in arguments is the real reason to run doctest as a command.

    Bug discovery and initial patch by Florent Xicluna.
  ........
................