diff options
| author | Xiang Zhang <angwerzx@126.com> | 2016-12-19 14:05:46 (GMT) |
|---|---|---|
| committer | Xiang Zhang <angwerzx@126.com> | 2016-12-19 14:05:46 (GMT) |
| commit | f76df278068252fe7637caeb2d7166f761f124fb (patch) | |
| tree | 83e35f04e0c68ab87868206f0211e2227d9ad0dc /Lib/test/libregrtest | |
| parent | b6522d0f77297cca197e724dda06814568604a93 (diff) | |
| parent | 772bf2ed831671dfd3afd507c2e9babd066d1024 (diff) | |
| download | cpython-f76df278068252fe7637caeb2d7166f761f124fb.zip cpython-f76df278068252fe7637caeb2d7166f761f124fb.tar.gz cpython-f76df278068252fe7637caeb2d7166f761f124fb.tar.bz2 | |
Issue #28950: Merge 3.6.
Diffstat (limited to 'Lib/test/libregrtest')
| -rw-r--r-- | Lib/test/libregrtest/cmdline.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py index 891b00c..d621f5f 100644 --- a/Lib/test/libregrtest/cmdline.py +++ b/Lib/test/libregrtest/cmdline.py @@ -301,9 +301,9 @@ def _parse_args(args, **kwargs): if ns.single and ns.fromfile: parser.error("-s and -f don't go together!") - if ns.use_mp and ns.trace: + if ns.use_mp is not None and ns.trace: parser.error("-T and -j don't go together!") - if ns.use_mp and ns.findleaks: + if ns.use_mp is not None and ns.findleaks: parser.error("-l and -j don't go together!") if ns.failfast and not (ns.verbose or ns.verbose3): parser.error("-G/--failfast needs either -v or -W") |