merge 3.2

diff --cc Lib/test/test_exceptions.py
index 1d897f29583b6f6d2780503ab1bc25068b5e1e1f,79bd7ffd3a004a83dcbfda5d63d832cfe7e9e6bf..1ad7f97b740ed300e1e9c30835a3aff515f6e94f
--- 1/Lib/test/test_exceptions.py
--- 2/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@@ -7,17 -7,8 +7,18 @@@ import pickl
  import weakref
  import errno
  
- from test.support import (TESTFN, unlink, run_unittest, captured_output,
-                           gc_collect, cpython_only, no_tracing)
+ from test.support import (TESTFN, captured_output, check_impl_detail,
 -                          cpython_only, gc_collect, run_unittest, unlink)
++                          cpython_only, gc_collect, run_unittest, no_tracing,
++                          unlink)
 +
 +class NaiveException(Exception):
 +    def __init__(self, x):
 +        self.x = x
 +
 +class SlottedNaiveException(Exception):
 +    __slots__ = ('x',)
 +    def __init__(self, x):
 +        self.x = x
  
  # XXX This is not really enough, each *operation* should be tested!