diff Python/sysmodule.c @ 75097:ed76dc34b39d

Merge 3.2: Issue #13703 plus some related test suite fixes.
author Georg Brandl <georg@python.org>
date Tue, 21 Feb 2012 00:33:36 +0100
parents 8b591a86fc91 4a31f6b11e7a
children 294f8aeb4d4b
line wrap: on
line diff
--- a/Python/sysmodule.c	Mon Feb 20 22:06:59 2012 +0100
+++ b/Python/sysmodule.c	Tue Feb 21 00:33:36 2012 +0100
@@ -1332,6 +1332,7 @@
     /* {"skip_first",                   "-x"}, */
     {"bytes_warning",           "-b"},
     {"quiet",                   "-q"},
+    {"hash_randomization",      "-R"},
     {0}
 };
 
@@ -1340,9 +1341,9 @@
     flags__doc__,       /* doc */
     flags_fields,       /* fields */
 #ifdef RISCOS
-    12
+    13
 #else
-    11
+    12
 #endif
 };
 
@@ -1375,6 +1376,7 @@
     /* SetFlag(skipfirstline); */
     SetFlag(Py_BytesWarningFlag);
     SetFlag(Py_QuietFlag);
+    SetFlag(Py_HashRandomizationFlag);
 #undef SetFlag
 
     if (PyErr_Occurred()) {