commit 2fb477c0f0284439d40cb3f46eea45ef42446e53
author Georg Brandl <georg@python.org> Tue Feb 21 00:33:36 2012 +0100
committer Georg Brandl <georg@python.org> Tue Feb 21 00:33:36 2012 +0100
tree c8df3747d511256d56ca4af046db7915b5c06096
parent b5c793a0b349cb02003433c30a410595b224079f
parent 9edceb3e591063f382ae82e14313813ffc1af0bf

Merge 3.2: Issue #13703 plus some related test suite fixes.

Python/sysmodule.c

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 955219f..c434b5a 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -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()) {