merge 3.2

diff --cc Lib/test/test_exceptions.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Python/ceval.c
Simple merge