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

Sat Jan 14 11:39:42 CET 2012

http://hg.python.org/cpython/rev/6797e7458ad0
changeset: 74383:6797e7458ad0
parent: 74382:b84f61fdcb4c
parent: 74381:9a0efac5bbcb
user: Senthil Kumaran <senthil at uthcode.com>
date: Sat Jan 14 18:39:23 2012 +0800
summary:
 merge from 3.2
files:
 Lib/test/regrtest.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -298,7 +298,7 @@
 
 support.record_original_stdout(sys.stdout)
 try:
- opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:Gm:',
+ opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoSrf:lu:t:TD:NLR:FwWM:nj:Gm:',
 ['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',
-- 
Repository URL: http://hg.python.org/cpython
