diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-18 12:06:54 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-18 12:06:54 (GMT) |
| commit | 195ad6ce052bfdda8f47ffbf14becb95253bafc6 (patch) | |
| tree | c0f490b174554b01c026004656614852064a11ba /Python | |
| parent | 6654de69b2ac20651c708eb3183b61c03624a018 (diff) | |
| parent | f7c709d62d09ef91b335ac7c262f0079713846a1 (diff) | |
| download | cpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.zip cpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.tar.gz cpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.tar.bz2 | |
#16306: merge with 3.3.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/getopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Python/getopt.c b/Python/getopt.c index cc42431..037aa5d 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -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 '_'; } |