Add the function/method name to assertRaises.

diff --git a/Lib/unittest.py b/Lib/unittest.py
index 16f062b3ab5cabe7d21dfd586c7c3e69334b2715..931d2f6f72a6683e502970bb08e5905527721f47 100644 (file)
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -311,9 +311,10 @@ class TestCase:
         except excClass:
             return
         else:
-            if hasattr(excClass,'__name__'): excName = excClass.__name__
-            else: excName = str(excClass)
-            raise self.failureException, "%s not raised" % excName
+            excName = str(getattr(excClass, '__name__', excClass))
+            objName = str(getattr(callableObj, '__name__', callableObj))
+            raise self.failureException, "%s not raised by %s" % (excName,
+                                                                  objName)
 
     def failUnlessEqual(self, first, second, msg=None):
         """Fail if the two objects are unequal as determined by the '=='