[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4.

[larry.hastings]

https://hg.python.org/cpython/rev/28ba862036cc
changeset:   94777:28ba862036cc
parent:      94775:38c503c2c066
parent:      94776:bcc877a28219
user:        Larry Hastings <larry at hastings.org>
date:        Fri Feb 27 09:21:06 2015 -0800
summary:
  Merge from 3.4.

files:
  Misc/NEWS |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -345,8 +345,6 @@
 
 - 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 @@
   __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.

-- 
Repository URL: https://hg.python.org/cpython