[pypy-svn] r72534 - pypy/trunk/py/impl/test

[arigo at codespeak.net]

Author: arigo
Date: Mon Mar 22 12:32:28 2010
New Revision: 72534

Modified:
   pypy/trunk/py/impl/test/outcome.py
Log:
Another fix in the py lib.  I don't like too much checking in there,
but it really obscures a test failure...


Modified: pypy/trunk/py/impl/test/outcome.py
==============================================================================
--- pypy/trunk/py/impl/test/outcome.py	(original)
+++ pypy/trunk/py/impl/test/outcome.py	Mon Mar 22 12:32:28 2010
@@ -90,7 +90,7 @@
         k = ", ".join(["%s=%r" % x for x in kwargs.items()])
         if k:
             k = ', ' + k
-        expr = '%s(%r%s)' %(func.__name__, args, k)
+        expr = '%s(%r%s)' %(getattr(func, '__name__', func), args, k)
     raise ExceptionFailure(msg="DID NOT RAISE", 
                            expr=args, expected=ExpectedException)