diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 02:44:56 (GMT) |
| commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch) | |
| tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e /Python/sysmodule.c | |
| parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
| parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
| download | cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.zip cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz cpython-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.bz2 | |
merge 2.6 with hash randomization fix
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 a0374fb..814eccb 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -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()) { |