summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-02-27 17:21:06 (GMT)
committerLarry Hastings <larry@hastings.org>2015-02-27 17:21:06 (GMT)
commit2f710b60084cdfc37513b169af425e98d950302b (patch)
treecc83f82e7137238d3f73eb16ffe319411a49b228 /Misc/NEWS
parent8004e8577cd894bbf1a1edce75cfb6802dd7d270 (diff)
parentc332f8a4920f11a2acad55abe5592afa94527723 (diff)
downloadcpython-2f710b60084cdfc37513b169af425e98d950302b.zip
cpython-2f710b60084cdfc37513b169af425e98d950302b.tar.gz
cpython-2f710b60084cdfc37513b169af425e98d950302b.tar.bz2
Merge from 3.4.
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS4
1 files changed, 1 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 17641ce..fc84b5e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -345,8 +345,6 @@ Library
- Issue #23366: Fixed possible integer overflow in itertools.combinations.
-- Issue #23366: Fixed possible integer overflow in itertools.combinations.
-
- Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii.
@@ -376,7 +374,7 @@ Library
__ne__() now works correctly.
- Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed)
- headers with no key rather than amusing the body has started.
+ headers with no key rather than assuming the body has started.
- Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl
module.