From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 13 Apr 2013 16:46:04 +0000 (+0100)
Subject: Issue #17715: Merge fix from 3.3.
X-Git-Tag: v3.4.0a1~962
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93196eb44f935de8132fd79e8be215657ea6b600;p=python

Issue #17715: Merge fix from 3.3.
---

93196eb44f935de8132fd79e8be215657ea6b600
diff --cc Misc/NEWS
index c4a73debcf,4fd149a796..24691d5f0c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -12,9 +10,11 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #17715: Fix segmentation fault from raising an exception in a __trunc__
+   method.
+ 
 +- Issue #17643: Add __callback__ attribute to weakref.ref.
 +
  - Issue #16447: Fixed potential segmentation fault when setting __name__ on a
    class.