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

Simple merge
diff --cc Misc/NEWS
index 27c0f02bc7647033634916b2c60fa98d4ff51faa,0972950be21ef86f257ca9a4ee873871f2dcd4cd..26db7202c03fd3de543f1de14972549acfd59a3d
+++ b/Misc/NEWS
@@@ -226,11 -50,10 +226,13 @@@ 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 #23366: Fixed possible integer overflow in itertools.combinations.
  - Issue #23369: Fixed possible integer overflow in
    _json.encode_basestring_ascii.