From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 03:52:43 +0000 (-0400)
Subject: merge 3.4 (#21209)
X-Git-Tag: v3.5.0a1~1899
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a548a30fed74819c4b1411dde4f07944770b5df4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21209)
---

a548a30fed74819c4b1411dde4f07944770b5df4
diff --cc Misc/NEWS
index a363a14cc100,6e149686294e..e14e6e7aaa4a
--- a/Misc/NEWS
+++ 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.