[Erp5-report] r46013 arnaud.fontaine - /erp5/trunk/utils/erp5.utils.benchmark/src/erp5/util...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Tue Aug 30 10:11:19 2011
New Revision: 46013

URL: http://svn.erp5.org?rev=46013&view=rev
Log:
Display page source upon error only if it's not an instance of BaseException

Modified:
    erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/process.py

Modified: erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/process.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/process.py?rev=46013&r1=46012&r2=46013&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/process.py [utf8] (original)
+++ erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/process.py [utf8] Tue Aug 30 10:11:19 2011
@@ -70,9 +70,10 @@ class BenchmarkProcess(multiprocessing.P
 
       try:
         target(result, self._browser)
-      except:
+      except BaseException, e:
         msg = "%s: %s" % (target, traceback.format_exc())
-        if self._argument_namespace.enable_debug:
+
+        if (self._argument_namespace.enable_debug and isinstance(e, Exception)):
           try:
             msg += self._browser.normalized_contents
           except: