summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-11-27 01:24:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-11-27 01:24:01 (GMT)
commitd75803c1fcab18eca7859c212ca594137dd75e25 (patch)
treede4e78c5a8e00ecafc71cda7f7bc7e41a12286c3 /Misc
parent14fff88773a1a01441654c0fc45d323801e5dbe8 (diff)
parent0ee22bf7743dc9a6d593c432f787d7bfe70be199 (diff)
downloadcpython-d75803c1fcab18eca7859c212ca594137dd75e25.zip
cpython-d75803c1fcab18eca7859c212ca594137dd75e25.tar.gz
cpython-d75803c1fcab18eca7859c212ca594137dd75e25.tar.bz2
merge 3.3 (#19729)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 88bef18..bb37f9f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: 2014-01-05
Core and Builtins
-----------------
+- Issue #19729: In str.format(), fix recursive expansion in format spec.
+
- Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2
billion characters) input strings in _Py_dg_strtod.