From: Philip Jenvey <pjenvey@underboss.org>
Date: Wed, 14 Nov 2012 22:49:49 +0000 (-0800)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~635
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21c95ebf7f398a03102e241c5f0fc416857b2529;p=python

merge 3.2
---

21c95ebf7f398a03102e241c5f0fc416857b2529
diff --cc Lib/test/test_exceptions.py
index 1d897f2958,79bd7ffd3a..1ad7f97b74
--- a/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!