]> granicus.if.org Git - python/commitdiff
Issue #17715: Merge fix from 3.3.
authorMark Dickinson <dickinsm@gmail.com>
Sat, 13 Apr 2013 16:46:04 +0000 (17:46 +0100)
committerMark Dickinson <dickinsm@gmail.com>
Sat, 13 Apr 2013 16:46:04 +0000 (17:46 +0100)
1  2 
Lib/test/test_int.py
Misc/NEWS
Objects/abstract.c

Simple merge
diff --cc Misc/NEWS
index c4a73debcf5ad7e22507ab3628aa86168af44b88,4fd149a796ed211725d7977e39fc9710c19ef4ef..24691d5f0cb75311c7125d7a4b865f283e24581c
+++ 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.
  
Simple merge