#16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter. Patch by Hieu Nguyen.

This commit is contained in:
Ezio Melotti 2012-11-18 13:55:52 +02:00
parent 6a5fc4c443
commit 7c66319edc
4 changed files with 17 additions and 6 deletions

View File

@ -7,7 +7,8 @@ import os
import sys
import subprocess
import tempfile
from test.script_helper import spawn_python, kill_python, assert_python_ok, assert_python_failure
from test.script_helper import (spawn_python, kill_python, assert_python_ok,
assert_python_failure)
# XXX (ncoghlan): Move to script_helper and make consistent with run_python
@ -376,6 +377,12 @@ class CmdLineTest(unittest.TestCase):
assert_python_ok(filename)
def test_unknown_options(self):
rc, out, err = assert_python_failure('-z', __cleanenv=True)
self.assertIn(b'Unknown option', err)
self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
self.assertEqual(b'', out)
def test_main():
test.support.run_unittest(CmdLineTest)
test.support.reap_children()

View File

@ -757,6 +757,7 @@ Tony Nelson
Chad Netzer
Max Neunhöffer
George Neville-Neil
Hieu Nguyen
Johannes Nicolai
Samuel Nicolary
Gustavo Niemeyer

View File

@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins
-----------------
- Issue #16306: Fix multiple error messages when unknown command line
parameters where passed to the interpreter. Patch by Hieu Nguyen.
- Issue #16453: Fix equality testing of dead weakref objects.
- Issue #9535: Fix pending signals that have been received but not yet

View File

@ -45,7 +45,7 @@ static wchar_t *opt_ptr = L"";
void _PyOS_ResetGetOpt(void)
{
_PyOS_opterr = 1;
_PyOS_opterr = 0; /* prevent printing the error in 2nd loop in main.c */
_PyOS_optind = 1;
_PyOS_optarg = NULL;
opt_ptr = L"";
@ -90,18 +90,18 @@ int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring)
opt_ptr = &argv[_PyOS_optind++][1];
}
if ( (option = *opt_ptr++) == L'\0')
if ((option = *opt_ptr++) == L'\0')
return -1;
if (option == 'J') {
fprintf(stderr, "-J is reserved for Jython\n");
if (_PyOS_opterr)
fprintf(stderr, "-J is reserved for Jython\n");
return '_';
}
if ((ptr = wcschr(optstring, option)) == NULL) {
if (_PyOS_opterr)
fprintf(stderr, "Unknown option: -%c\n", (char)option);
fprintf(stderr, "Unknown option: -%c\n", (char)option);
return '_';
}