]> granicus.if.org Git - python/commitdiff
Merge #12757: Make doctest skipping in -OO mode work with unittest/regrtest -v
authorR David Murray <rdmurray@bitdance.com>
Wed, 21 Mar 2012 18:55:04 +0000 (14:55 -0400)
committerR David Murray <rdmurray@bitdance.com>
Wed, 21 Mar 2012 18:55:04 +0000 (14:55 -0400)
1  2 
Lib/doctest.py
Misc/NEWS

diff --cc Lib/doctest.py
Simple merge
diff --cc Misc/NEWS
index 17716b5258d97406be5a8c17f812a1d93f59dbf9,606898f6d2c4acb61ad4bf9814f29ed7ca456273..09ff26a6d5b3ace78f33167e3a3bcdf15d945a97
+++ b/Misc/NEWS
@@@ -30,10 -28,9 +30,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12757: Fix the skipping of doctests when python is run with -OO so
+   that it works in unittest's verbose mode as well as non-verbose mode.
 +- Issue #7652: Integrate the decimal floating point libmpdec library to speed
 +  up the decimal module. Performance gains of the new C implementation are
 +  between 12x and 80x, depending on the application.
 +
  - Issue #3573: IDLE hangs when passing invalid command line args
    (directory(ies) instead of file(s)) (Patch by Guilherme Polo)