if the input is not str but unicode, convert it to str, otherwise...

if the input is not str but unicode, convert it to str, otherwise UnicodeEncodeError can be raised by exporting Page Template containing non-ASCII characters.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28750 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/patches/ppml.py

@@ -45,7 +45,10 @@ def convert(S, find=None):
     ###              [\x00-\x1f] characters will be escaped to make a more
     ###              readable output.
     try:
-        S.decode('utf8')
+        if isinstance(S, unicode):
+            S = S.encode('utf8')
+        else:
+            S.decode('utf8')
     except UnicodeDecodeError:
         new = ''.join([reprs3.get(x) for x in S])
     else: