Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 2.6

This commit is contained in:
Georg Brandl 2012-02-21 22:38:31 +01:00
parent 0607f731f2 3aec568e6e
commit 66e565ee48
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/using/cmdline.rst
View File

@ -262,7 +262,7 @@ Miscellaneous options
This is intended to provide protection against a denial-of-service caused by This is intended to provide protection against a denial-of-service caused by
carefully-chosen inputs that exploit the worst case performance of a dict carefully-chosen inputs that exploit the worst case performance of a dict
insertion, O(n^2) complexity. See construction, O(n^2) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html for details. http://www.ocert.org/advisories/ocert-2011-003.html for details.
Changing hash values affects the order in which keys are retrieved from a Changing hash values affects the order in which keys are retrieved from a

2
Misc/python.man
View File

@ -162,7 +162,7 @@ not predictable between repeated invocations of Python.
.IP .IP
This is intended to provide protection against a denial of service This is intended to provide protection against a denial of service
caused by carefully-chosen inputs that exploit the worst case performance caused by carefully-chosen inputs that exploit the worst case performance
of a dict insertion, O(n^2) complexity. See of a dict construction, O(n^2) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html http://www.ocert.org/advisories/ocert-2011-003.html
for details. for details.
.TP .TP

6
Modules/main.c
View File

@ -106,9 +106,9 @@ PYTHONCASEOK : ignore case in 'import' statements (Windows).\n\
PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\ PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
"; ";
static char *usage_6 = "\ static char *usage_6 = "\
PYTHONHASHSEED: if this variable is set to ``random``, the effect is the same \n\ PYTHONHASHSEED: if this variable is set to 'random', the effect is the same\n\
as specifying the :option:`-R` option: a random value is used to seed the\n\ as specifying the -R option: a random value is used to seed the hashes of\n\
hashes of str, bytes and datetime objects. It can also be set to an integer\n\ str, bytes and datetime objects. It can also be set to an integer\n\
in the range [0,4294967295] to get hash values with a predictable seed.\n\ in the range [0,4294967295] to get hash values with a predictable seed.\n\
"; ";