From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 31 Jan 2015 10:23:01 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.5.0a1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=260cd320a1087fa040743fd46dd0d2c412a0ba17;p=python

Merge heads
---

260cd320a1087fa040743fd46dd0d2c412a0ba17
diff --cc Misc/NEWS
index 1588a2228e,495fd37e44..b725c5d811
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,9 -226,12 +226,15 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #23326: Removed __ne__ implementations.  Since fixing default __ne__
 +  implementation in issue #21408 they are redundant.
 +
+ - Issue #23353: Fix the exception handling of generators in
+   PyEval_EvalFrameEx(). At entry, save or swap the exception state even if
+   PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state
+   is now always restored or swapped, not only if why is WHY_YIELD or
+   WHY_RETURN. Patch co-written with Antoine Pitrou.
+ 
  - Issue #14099: Restored support of writing ZIP files to tellable but
    non-seekable streams.