[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

Sat Jan 14 11:39:41 CET 2012

http://hg.python.org/cpython/rev/b84f61fdcb4c
changeset: 74382:b84f61fdcb4c
parent: 74379:cfab2b2009e4
parent: 74380:4fc5dfad766a
user: Senthil Kumaran <senthil at uthcode.com>
date: Sat Jan 14 18:39:06 2012 +0800
summary:
 merge from 3.2
files:
 Lib/test/regrtest.py | 4 ++--
 Misc/NEWS | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -33,7 +33,7 @@
 -W/--verbose3 -- display test output on failure
 -d/--debug -- print traceback for failed tests
 -q/--quiet -- no output unless one or more tests fail
--S/--slow -- print the slowest 10 tests
+-o/--slow -- print the slowest 10 tests
 --header -- print header with interpreter info
 
 Selecting tests
@@ -340,7 +340,7 @@
 start = a
 elif o in ('-s', '--single'):
 single = True
- elif o in ('-S', '--slow'):
+ elif o in ('-o', '--slow'):
 print_slow = True
 elif o in ('-r', '--randomize'):
 randomize = True
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -442,6 +442,9 @@
 Library
 -------
 
+- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow
+ tests.
+
 - Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor.
 The hang would occur when retrieving the result of a scheduled future after
 the executor had been shut down.
-- 
Repository URL: http://hg.python.org/cpython
