]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23366)
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 02:01:43 +0000 (21:01 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 02:01:43 +0000 (21:01 -0500)
1  2 
Lib/test/test_itertools.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 40c0f015c393c6f40a8c237a03a34b7e2b37e1a4,bf05c2b8d83a7cf6b72b8ca5a57c31789b128dd8..27c0f02bc7647033634916b2c60fa98d4ff51faa
+++ b/Misc/NEWS
@@@ -226,9 -50,8 +226,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #23326: Removed __ne__ implementations.  Since fixing default __ne__
 +  implementation in issue #21408 they are redundant.
 +
+ - Issue #23366: Fixed possible integer overflow in itertools.combinations.
  - Issue #23369: Fixed possible integer overflow in
    _json.encode_basestring_ascii.