Commit 1404f1da authored by 's avatar

- moved special debug (== not handle_errors != debug mode) behavior up the stack

parent 8fa32d65
......@@ -235,14 +235,6 @@ class Item(Base,
if not REQUEST:
REQUEST = aq_acquire(self, 'REQUEST')
handle_errors = getattr(getattr(REQUEST, 'RESPONSE', None),
'handle_errors', False)
if not handle_errors:
# If we have been asked not to handle errors don't even bother
# with transforming the exception into HTML. Just re-raise the
# original exception right away.
raise error_type, error_value, tb
try:
s = aq_acquire(client, 'standard_error_message')
......
......@@ -153,7 +153,8 @@ def publish(request, module_name, after_list, debug=0,
getattr(cl,'__name__',cl), val,
debug_mode and compact_traceback()[-1] or ''))
if err_hook is not None:
# debug is just used by tests (has nothing to do with debug_mode!)
if not debug and err_hook is not None:
retry = False
if parents:
parents=parents[0]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment