]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#21209)
authorBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 03:52:43 +0000 (23:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 03:52:43 +0000 (23:52 -0400)
1  2 
Misc/NEWS
Python/ceval.c

diff --cc Misc/NEWS
index a363a14cc100037a9f1e2d70621d2fb6c0d6ccd9,6e149686294e70f910cc3774bf30b486e50906e3..e14e6e7aaa4ad5a36efeddabcd426ff4cf0f8ac5
+++ b/Misc/NEWS
@@@ -10,11 -10,9 +10,14 @@@ Release date: TB
  Core and Builtins
  -----------------
  
+ - Issue #21209: Fix sending tuples to custom generator objects with the yield
+   from syntax.
 +- Issue #21193: pow(a, b, c) now raises ValueError rather than TypeError when b
 +  is negative.  Patch by Josh Rosenberg.
 +
 +- PEP 465 and Issue #21176: Add the '@' operator for matrix multiplication.
 +
  - Issue #21134: Fix segfault when str is called on an uninitialized
    UnicodeEncodeError, UnicodeDecodeError, or UnicodeTranslateError object.
  
diff --cc Python/ceval.c
Simple merge