summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-06-14 13:05:21 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-06-14 13:05:21 (GMT)
commit673ac2749943d4077137984a640e8f6eb2f43a26 (patch)
tree24e286f046f12c3bf5953c34f02b4777d678dba1
parente0b70cd8a986aaeec74f5647c7ffc4200f2e14f3 (diff)
parentfd7f19ea67b0585929e723303c40de9153bba91d (diff)
downloadcpython-673ac2749943d4077137984a640e8f6eb2f43a26.zip
cpython-673ac2749943d4077137984a640e8f6eb2f43a26.tar.gz
cpython-673ac2749943d4077137984a640e8f6eb2f43a26.tar.bz2
Merge 3.5
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f4dd64c..bf7b8f1 100644
--- 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