Commit 5aa6b549 authored by Christian Theune's avatar Christian Theune

The real fix for bug 471. The environment didn't truly let us do a simple

try/except so we need to explicitly check.
parent 1d040811
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
############################################################################## ##############################################################################
__doc__="""Python Object Publisher -- Publish Python objects on web servers __doc__="""Python Object Publisher -- Publish Python objects on web servers
$Id: Publish.py,v 1.159 2003/03/17 11:12:11 ctheune Exp $""" $Id: Publish.py,v 1.160 2003/03/17 13:58:43 ctheune Exp $"""
__version__='$Revision: 1.159 $'[11:-2] __version__='$Revision: 1.160 $'[11:-2]
import sys, os import sys, os
from Response import Response from Response import Response
...@@ -58,6 +58,7 @@ def publish(request, module_name, after_list, debug=0, ...@@ -58,6 +58,7 @@ def publish(request, module_name, after_list, debug=0,
validated_hook, transactions_manager)= get_module_info(module_name) validated_hook, transactions_manager)= get_module_info(module_name)
parents=None parents=None
response=None
try: try:
request.processInputs() request.processInputs()
...@@ -106,8 +107,10 @@ def publish(request, module_name, after_list, debug=0, ...@@ -106,8 +107,10 @@ def publish(request, module_name, after_list, debug=0,
if transactions_manager: transactions_manager.abort() if transactions_manager: transactions_manager.abort()
# DM: provide nicer error message for FTP # DM: provide nicer error message for FTP
try: sm= response.setMessage sm = None
except: sm= None if response is not None:
sm = getattr(response, "setMessage", None)
if sm is not None: if sm is not None:
from ZServer.medusa.asyncore import compact_traceback from ZServer.medusa.asyncore import compact_traceback
cl,val= sys.exc_info()[:2] cl,val= sys.exc_info()[:2]
......
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