From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 May 2011 00:31:01 +0000 (-0500)
Subject: excellent place for assertRaises
X-Git-Tag: v3.3.0a1~2183^2~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b45c7087aa967843f2e11116fbb4a7f5a32a1c3f;p=thirdparty%2FPython%2Fcpython.git

excellent place for assertRaises
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 31731d2b653f..0fae2dfe9fb3 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1631,12 +1631,7 @@ order (MRO) for bases """
             for attr, obj in env.items():
                 setattr(X, attr, obj)
             setattr(X, name, ErrDescr())
-            try:
-                runner(X())
-            except MyException:
-                pass
-            else:
-                self.fail("{0!r} didn't raise".format(name))
+            self.assertRaises(MyException, runner, X())
 
     def test_specials(self):
         # Testing special operators...