Return str in Python 3

plone · Oct 5, 2018 · f8630f8 · f8630f8
1 parent 7ae5447
commit f8630f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -15,7 +15,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Return str from transform in Python 3.
+  [davisagli]
 
 
 2.2.1 (2018-01-17)

diff --git a/plone/intelligenttext/README.rst b/plone/intelligenttext/README.rst
@@ -73,7 +73,7 @@ Indentation should be preserved::
     ...       URL: http://foo.com"""
     >>> bprint(convertWebIntelligentPlainTextToHtml(orig))
     A test<br />&nbsp;&nbsp;URL: <a href="http://test.com" rel="nofollow">http://test.com</a><br />&nbsp;&nbsp;&nbsp;&nbsp;Mail: <a href="&#0109;ailto&#0058;test&#0064;test.com">test&#0064;test.com</a><br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;URL: <a href="http://foo.com" rel="nofollow">http://foo.com</a>
-    >>> convertWebIntelligentPlainTextToHtml(orig).count(b'&nbsp;')
+    >>> convertWebIntelligentPlainTextToHtml(orig).count('&nbsp;')
     12
 
 HTML entities should be escaped::

diff --git a/plone/intelligenttext/transforms.py b/plone/intelligenttext/transforms.py
@@ -55,7 +55,8 @@ def __call__(self):
         # Finally, make \n's into br's
         text = text.replace('\n', '<br />')
 
-        text = text.encode('utf-8')
+        if not PY3:
+            text = text.encode('utf-8')
 
         return text