Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 2.6

This commit is contained in:
Benjamin Peterson 2012-02-21 15:09:08 -05:00
parent 5d6eab9088 4e171d12da
commit 6647113419
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/main.c
View File

@ -423,12 +423,6 @@ Py_Main(int argc, char **argv)
case 'W': case 'W':
PySys_AddWarnOption(_PyOS_optarg); PySys_AddWarnOption(_PyOS_optarg);
/* Extremely obscure hack: if _PyOS_optarg was one character,
PyString_FromString in PySys_AddWarnOption will try to intern
it. This is bad because hash randomization has not been setup
yet, so the string will get the wrong hash. The following call
will cause all the cached characters to be released. */
PyString_Fini();
break; break;
case 'R': case 'R':