Mercurial > cpython-lru_cache-weakref

diff Python/sysmodule.c @ 75102:a0f43f4481e0 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 2.6 with hash randomization fix
author Benjamin Peterson <benjamin@python.org>
date Mon, 20 Feb 2012 21:44:56 -0500
parents c351536e804a 6b7704fe1be1
children 187a678c6033
line wrap: on
line diff
--- a/Python/sysmodule.c	Mon Feb 20 15:20:37 2012 -0500
+++ b/Python/sysmodule.c	Mon Feb 20 21:44:56 2012 -0500
@@ -1209,6 +1209,7 @@
     {"unicode",                 "-U"},
     /* {"skip_first",                   "-x"}, */
     {"bytes_warning", "-b"},
+    {"hash_randomization", "-R"},
     {0}
 };
 
@@ -1217,9 +1218,9 @@
     flags__doc__,       /* doc */
     flags_fields,       /* fields */
 #ifdef RISCOS
-    16
+    17
 #else
-    15
+    16
 #endif
 };
 
@@ -1256,6 +1257,7 @@
     SetFlag(Py_UnicodeFlag);
     /* SetFlag(skipfirstline); */
     SetFlag(Py_BytesWarningFlag);
+    SetFlag(Py_HashRandomizationFlag);
 #undef SetFlag
 
     if (PyErr_Occurred()) {