mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-14 13:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge 2.6 with hash randomization fix

Browse source
This commit is contained in:
Benjamin Peterson 2012-02-20 21:44:56 -05:00
commit aee9dfba4a
26 changed files with 2503 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/sysmodule.c
View file

@ -1209,6 +1209,7 @@ static PyStructSequence_Field flags_fields[] = {
{"unicode", "-U"},
/* {"skip_first", "-x"}, */
{"bytes_warning", "-b"},
{"hash_randomization", "-R"},
{0}
};
@ -1217,9 +1218,9 @@ static PyStructSequence_Desc flags_desc = {
flags__doc__, /* doc */
flags_fields, /* fields */
#ifdef RISCOS
16
17
#else
15
16
#endif
};
@ -1256,6 +1257,7 @@ make_flags(void)
SetFlag(Py_UnicodeFlag);
/* SetFlag(skipfirstline); */
SetFlag(Py_BytesWarningFlag);
SetFlag(Py_HashRandomizationFlag);
#undef SetFlag
if (PyErr_Occurred()) {