Skip to content

Commit 66e565e

Browse files
committed
merge with 2.6
2 parents 0607f73 + 3aec568 commit 66e565e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Doc/using/cmdline.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Miscellaneous options
262262

263263
This is intended to provide protection against a denial-of-service caused by
264264
carefully-chosen inputs that exploit the worst case performance of a dict
265-
insertion, O(n^2) complexity. See
265+
construction, O(n^2) complexity. See
266266
http://www.ocert.org/advisories/ocert-2011-003.html for details.
267267

268268
Changing hash values affects the order in which keys are retrieved from a

Misc/python.man

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ not predictable between repeated invocations of Python.
162162
.IP
163163
This is intended to provide protection against a denial of service
164164
caused by carefully-chosen inputs that exploit the worst case performance
165-
of a dict insertion, O(n^2) complexity. See
165+
of a dict construction, O(n^2) complexity. See
166166
http://www.ocert.org/advisories/ocert-2011-003.html
167167
for details.
168168
.TP

Modules/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ PYTHONCASEOK : ignore case in 'import' statements (Windows).\n\
106106
PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
107107
";
108108
static char *usage_6 = "\
109-
PYTHONHASHSEED: if this variable is set to ``random``, the effect is the same \n\
110-
as specifying the :option:`-R` option: a random value is used to seed the\n\
111-
hashes of str, bytes and datetime objects. It can also be set to an integer\n\
109+
PYTHONHASHSEED: if this variable is set to 'random', the effect is the same\n\
110+
as specifying the -R option: a random value is used to seed the hashes of\n\
111+
str, bytes and datetime objects. It can also be set to an integer\n\
112112
in the range [0,4294967295] to get hash values with a predictable seed.\n\
113113
";
114114

0 commit comments

Comments
 (0)