diff options
| author | Georg Brandl <georg@python.org> | 2012-02-20 23:33:36 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-02-20 23:33:36 (GMT) |
| commit | 2fb477c0f0284439d40cb3f46eea45ef42446e53 (patch) | |
| tree | c8df3747d511256d56ca4af046db7915b5c06096 /Python/sysmodule.c | |
| parent | b5c793a0b349cb02003433c30a410595b224079f (diff) | |
| parent | 9edceb3e591063f382ae82e14313813ffc1af0bf (diff) | |
| download | cpython-2fb477c0f0284439d40cb3f46eea45ef42446e53.zip cpython-2fb477c0f0284439d40cb3f46eea45ef42446e53.tar.gz cpython-2fb477c0f0284439d40cb3f46eea45ef42446e53.tar.bz2 | |
Merge 3.2: Issue #13703 plus some related test suite fixes.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ static PyStructSequence_Field flags_fields[] = { /* {"skip_first", "-x"}, */ {"bytes_warning", "-b"}, {"quiet", "-q"}, + {"hash_randomization", "-R"}, {0} }; @@ -1340,9 +1341,9 @@ static PyStructSequence_Desc flags_desc = { flags__doc__, /* doc */ flags_fields, /* fields */ #ifdef RISCOS - 12 + 13 #else - 11 + 12 #endif }; @@ -1375,6 +1376,7 @@ make_flags(void) /* SetFlag(skipfirstline); */ SetFlag(Py_BytesWarningFlag); SetFlag(Py_QuietFlag); + SetFlag(Py_HashRandomizationFlag); #undef SetFlag if (PyErr_Occurred()) { |