Commit e4808a34 authored by matt@zope.com's avatar matt@zope.com

Recode the isinstance check to something that wont crash if arg 1 is not

an extension class
parent 062ff778
......@@ -74,6 +74,10 @@ Zope Changes
- Some calls to os.system('chmod') has been replaced with the more
portable os.chmod() call, to make install work properly on Windows.
- Fixed an isinstance() check in SimpleItem on standard_error_message
handling that would always break if the first argument was not
an extension class because the second argument was a type.
Zope 2.6.1 beta 2
......
......@@ -17,8 +17,8 @@ Aqueduct database adapters, etc.
This module can also be used as a simple template for implementing new
item types.
$Id: SimpleItem.py,v 1.105 2002/08/30 20:21:29 caseman Exp $'''
__version__='$Revision: 1.105 $'[11:-2]
$Id: SimpleItem.py,v 1.106 2003/02/04 16:38:10 matt Exp $'''
__version__='$Revision: 1.106 $'[11:-2]
import re, sys, Globals, App.Management, Acquisition, App.Undo
import AccessControl.Role, AccessControl.Owned, App.Common
......@@ -197,7 +197,7 @@ class Item(Base, Resource, CopySource, App.Management.Tabs, Traversable,
'error_message': error_message,
'error_log_url': error_log_url}
if isinstance(s, HTML):
if getattr(aq_base(s),'isDocTemp',0):
v = s(client, REQUEST, **kwargs)
elif callable(s):
v = s(**kwargs)
......
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