Commit 4c3767ed authored by 's avatar

Bug 1797: unicode safety

parent d49cb7ca
...@@ -89,8 +89,8 @@ Aqueduct database adapters, etc. ...@@ -89,8 +89,8 @@ Aqueduct database adapters, etc.
This module can also be used as a simple template for implementing new This module can also be used as a simple template for implementing new
item types. item types.
$Id: SimpleItem.py,v 1.80 2000/12/11 15:01:57 brian Exp $''' $Id: SimpleItem.py,v 1.81 2000/12/27 16:27:45 brian Exp $'''
__version__='$Revision: 1.80 $'[11:-2] __version__='$Revision: 1.81 $'[11:-2]
import ts_regex, sys, Globals, App.Management, Acquisition, App.Undo import ts_regex, sys, Globals, App.Management, Acquisition, App.Undo
import AccessControl.Role, AccessControl.Owned, App.Common import AccessControl.Role, AccessControl.Owned, App.Common
...@@ -238,9 +238,13 @@ class Item(Base, Resource, CopySource, App.Management.Tabs, Traversable, ...@@ -238,9 +238,13 @@ class Item(Base, Resource, CopySource, App.Management.Tabs, Traversable,
if not error_message: if not error_message:
if type(error_value) is InstanceType: if type(error_value) is InstanceType:
s=str(error_value) try:
if tagSearch(s) >= 0: s=str(error_value)
error_message=error_value except:
pass
else:
if tagSearch(s) >= 0:
error_message=error_value
elif (type(error_value) is StringType elif (type(error_value) is StringType
and tagSearch(error_value) >= 0): and tagSearch(error_value) >= 0):
error_message=error_value error_message=error_value
......
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