[Python-checkins] cpython (3.2): #16306: Fix multiple error messages when unknown command line parameters where

Sun Nov 18 13:07:17 CET 2012

http://hg.python.org/cpython/rev/0153c077a0fd
changeset: 80504:0153c077a0fd
branch: 3.2
parent: 80500:b193a5dc7a58
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Nov 18 13:55:52 2012 +0200
summary:
 #16306: Fix multiple error messages when unknown command line parameters where passed to the interpreter. Patch by Hieu Nguyen.
files:
 Lib/test/test_cmd_line.py | 9 ++++++++-
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 Python/getopt.c | 10 +++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -7,7 +7,8 @@
 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 @@
 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()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -757,6 +757,7 @@
 Chad Netzer
 Max Neunhöffer
 George Neville-Neil
+Hieu Nguyen
 Johannes Nicolai
 Samuel Nicolary
 Gustavo Niemeyer
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 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
diff --git a/Python/getopt.c b/Python/getopt.c
--- a/Python/getopt.c
+++ b/Python/getopt.c
@@ -45,7 +45,7 @@
 
 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 @@
 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 '_';
 }
 
-- 
Repository URL: http://hg.python.org/cpython
