[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[victor.stinner]

https://hg.python.org/cpython/rev/1f376758837d
changeset:   102032:1f376758837d
parent:      102030:2126e8cbc12f
parent:      102031:a36238de31ae
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Jun 14 15:05:21 2016 +0200
summary:
  Merge 3.5

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -477,7 +477,7 @@
 - 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

-- 
Repository URL: https://hg.python.org/cpython