[Python-checkins] cpython (merge 2.6 -> 2.7): merge 2.6

benjamin.peterson python-checkins at python.org
Tue Feb 21 21:09:18 CET 2012


http://hg.python.org/cpython/rev/b1a02c17b327
changeset:   75151:b1a02c17b327
branch:      2.7
parent:      75149:f9fdf519bca5
parent:      75150:6075df248b90
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Feb 21 15:09:08 2012 -0500
summary:
  merge 2.6

files:
  Modules/main.c |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -423,12 +423,6 @@
 
         case 'W':
             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;
 
         case 'R':

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list