merge 3.3

diff --cc Lib/test/test_exceptions.py
index 96964622011acd9c34451a6d5470400488b999be,1ad7f97b740ed300e1e9c30835a3aff515f6e94f..e62ed3c93b52e3b4ef1b16c2f54e2a2e81df4279
--- 1/Lib/test/test_exceptions.py
--- 2/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@@ -7,8 -7,9 +7,9 @@@ import pickl
  import weakref
  import errno
  
- from test.support import (TESTFN, unlink, run_unittest, captured_output,
-                           check_warnings, gc_collect, cpython_only, no_tracing)
+ from test.support import (TESTFN, captured_output, check_impl_detail,
 -                          cpython_only, gc_collect, run_unittest, no_tracing,
 -                          unlink)
++                          check_warnings, cpython_only, gc_collect, run_unittest,
++                          no_tracing, unlink)
  
  class NaiveException(Exception):
      def __init__(self, x):