Merge from 3.4.

This commit is contained in:
Larry Hastings 2015-02-27 09:21:06 -08:00
commit 2f710b6008
1 changed files with 1 additions and 3 deletions

View File

@ -345,8 +345,6 @@ Library
- Issue #23366: Fixed possible integer overflow in itertools.combinations. - 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 - Issue #23369: Fixed possible integer overflow in
_json.encode_basestring_ascii. _json.encode_basestring_ascii.
@ -376,7 +374,7 @@ Library
__ne__() now works correctly. __ne__() now works correctly.
- Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed) - 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 - Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl
module. module.