merge from 3.2

This commit is contained in:
Senthil Kumaran 2012-01-14 18:39:23 +08:00
commit 6c3dd7ea42
1 changed files with 1 additions and 1 deletions

View File

@ -298,7 +298,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
support.record_original_stdout(sys.stdout) support.record_original_stdout(sys.stdout)
try: 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', ['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks', 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir', 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',