merge with 2.6

This commit is contained in:
Georg Brandl 2012-02-21 22:38:31 +01:00
commit 66e565ee48
3 changed files with 5 additions and 5 deletions

View file

@ -162,7 +162,7 @@ not predictable between repeated invocations of Python.
.IP
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 insertion, O(n^2) complexity. See
of a dict construction, O(n^2) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html
for details.
.TP