Merge from 3.4.

2f710b60 · Larry Hastings · 8004e857 · c332f8a4 · 2f710b60
Commit 2f710b60 authored Feb 27, 2015 by Larry Hastings
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Misc/NEWS Misc/NEWS +1 -3

No files found.
--- 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.