Fix Plone 5 encoding test

collective · Oct 16, 2018 · f376249 · f376249
1 parent f6255b0
commit f376249
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/collective/cover/tiles/richtext.py b/src/collective/cover/tiles/richtext.py
@@ -12,6 +12,7 @@
 from plone.tiles.interfaces import ITileDataManager
 from plone.uuid.interfaces import IUUID
 from Products.CMFPlone.utils import safe_hasattr
+from Products.CMFPlone.utils import safe_unicode
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from zope import schema
 from zope.interface import implementer
@@ -93,10 +94,10 @@ def SearchableText(self):
         transforms = api.portal.get_tool('portal_transforms')
         data = transforms.convertTo(
             'text/plain',
-            value.encode('utf-8 ') if isinstance(value, six.text_type) else value.raw_encoded,
+            value.raw_encoded,
             mimetype='text/html',
             context=context,
-            encoding='utf-8' if isinstance(value, six.text_type) else value.encoding)
+            encoding=value.encoding)
 
-        searchable_text = six.text_type(data.getData(), 'utf-8')
+        searchable_text = safe_unicode(data.getData()).encode('utf-8')
         return searchable_text.strip()  # remove leading and trailing spaces