From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 14 Jun 2016 13:04:44 +0000 (+0200)
Subject: Issue #25843: Fix the NEWS entry
X-Git-Tag: v3.6.0a3~148^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd7f19ea67b0585929e723303c40de9153bba91d;p=thirdparty%2FPython%2Fcpython.git

Issue #25843: Fix the NEWS entry
---

diff --git a/Misc/NEWS b/Misc/NEWS
index eb810d00e176..e132b968ca3c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -124,7 +124,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 #22995: [UPDATE] Comment out the one of the pickleability tests in