Commit aadebc3f authored by Jim Fulton's avatar Jim Fulton

Changed to use standard error machinery.

The previous non-standard machinery didn't like
error instances.
parent 9de16f7c
......@@ -234,7 +234,6 @@ class ExternalMethod(OFS.SimpleItem.Item, Persistent, Explicit,
__traceback_info__=args, kw, self.func_defaults
try:
try:
try: return apply(f,args,kw)
except TypeError, v:
......@@ -248,28 +247,7 @@ class ExternalMethod(OFS.SimpleItem.Item, Persistent, Explicit,
raise TypeError, v, tb
finally: tb=None
except:
error_type=sys.exc_type
error_value=sys.exc_value
tb=sys.exc_traceback
if lower(error_type) in ('redirect',):
raise error_type, error_value, tb
if (type(error_value) is type('') and
regex.search('[a-zA-Z]>', error_value) > 0):
error_message=error_value
else:
error_message=''
error_tb=pretty_tb(error_type, error_value, tb)
c=self.aq_parent
try:
s=getattr(c, 'standard_error_message')
v=HTML.__call__(s, c, self.aq_acquire('REQUEST'),
error_type=error_type,
error_value=error_value,
error_tb=error_tb, error_traceback=error_tb,
error_message=error_message)
except: v='Sorry, an error occured'
raise error_type, v, tb
finally: tb=None
self.raise_standardErrorMessage()
def function(self): return self._function
......
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