Merge 3.5

vstinner · vstinner · commit 673ac2749943 · 2016-06-14T15:05:21.000+02:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -477,7 +477,7 @@ Core and Builtins
 - Issue #25843: When compiling code, don't merge constants if they are equal
   but have a different types. For example, ``f1, f2 = lambda: 1, lambda: 1.0``
   is now correctly compiled to two different functions: ``f1()`` returns ``1``
-  (``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0``
+  (``int``) and ``f2()`` returns ``1.0`` (``float``), even if ``1`` and ``1.0``
   are equal.
 
 - Issue #26107: The format of the ``co_lnotab`` attribute of code objects
