summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-23 16:52:39 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-23 16:52:39 (GMT)
commit8a6d1fed416fb84c74fa4fd948b3a2a395335278 (patch)
tree9b4ac3cc7318b76abc7237bed5124e13db9dfa67 /Python
parenta5c430940c0594563f3d4ac66eef2bd82904f7f4 (diff)
parenta0dd22e5e824195e322cb417ebb34c66475e952d (diff)
downloadcpython-8a6d1fed416fb84c74fa4fd948b3a2a395335278.zip
cpython-8a6d1fed416fb84c74fa4fd948b3a2a395335278.tar.gz
cpython-8a6d1fed416fb84c74fa4fd948b3a2a395335278.tar.bz2
#16306: merge with 3.2.
Diffstat (limited to 'Python')
-rw-r--r--Python/getopt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/getopt.c b/Python/getopt.c
index 037aa5d..5cf4cbd 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 = 0; /* prevent printing the error in 2nd loop in main.c */
+ _PyOS_opterr = 1;
_PyOS_optind = 1;
_PyOS_optarg = NULL;
opt_ptr = L"";