From: Philip Jenvey <pjenvey@underboss.org>
Date: Wed, 14 Nov 2012 22:51:44 +0000 (-0800)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2009
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f2b6ad96f15f38593cc68eae2b85390a4bee400;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

8f2b6ad96f15f38593cc68eae2b85390a4bee400
diff --cc Lib/test/test_exceptions.py
index 96964622011a,1ad7f97b740e..e62ed3c93b52
--- a/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):