From: R. David Murray <rdmurray@bitdance.com>
Date: Sun, 20 Dec 2009 17:12:58 +0000 (+0000)
Subject: Blocked revisions 76934-76935 via svnmerge
X-Git-Tag: v2.6.5rc1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63704f05fbf1a847228e7b160d3a69c9cd238521;p=python

Blocked revisions 76934-76935 via svnmerge

........
  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.
........
---