[pypy-svn] r66819 - pypy/branch/pyjitpl5/lib-python

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Aug 14 09:54:33 2009
New Revision: 66819

Modified:
   pypy/branch/pyjitpl5/lib-python/conftest.py
Log:
merge 66818 from trunk

Modified: pypy/branch/pyjitpl5/lib-python/conftest.py
==============================================================================
--- pypy/branch/pyjitpl5/lib-python/conftest.py	(original)
+++ pypy/branch/pyjitpl5/lib-python/conftest.py	Fri Aug 14 09:54:33 2009
@@ -636,9 +636,9 @@
         if exit_status:
             raise self.ExternalFailure(test_stdout, test_stderr)
 
-    def repr_failure(self, excinfo, outerr):
+    def repr_failure(self, excinfo):
         if not excinfo.errisinstance(self.ExternalFailure):
-            return super(ReallyRunFileExternal, self).repr_failure(excinfo, outerr)
+            return super(ReallyRunFileExternal, self).repr_failure(excinfo)
         out, err = excinfo.value.args
         return out + err