- make sure all JSON-serialized data is text data and not bytes

zopefoundation · Apr 26, 2019 · a0b0627 · a0b0627
1 parent 6e2c0ea
commit a0b0627
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 3.0b8 (unreleased)
 ------------------
 
+- make sure all JSON-serialized data is text data and not bytes
+  (`#45 <https://github.com/zopefoundation/DocumentTemplate/issues/45>`_)
+
 
 3.0b7 (2019-04-25)
 ------------------

diff --git a/src/TreeDisplay/TreeTag.py b/src/TreeDisplay/TreeTag.py
@@ -256,6 +256,7 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data,
                   try_call_attr=try_call_attr, encoding=None,
                   ):
     "Render a tree as a table"
+    encoding = encoding or 'latin-1'
     exp = 0
 
     if level >= 0:
@@ -340,7 +341,10 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data,
             items = list(items)  # Copy the list
             items.reverse()
 
-    diff.append(id)
+    if isinstance(id, six.binary_type):
+        diff.append(id.decode(encoding))
+    else:
+        diff.append(id)
 
     _td_colspan = '<td colspan="%s" style="white-space: nowrap"></td>'
     _td_single = '<td width="16" style="white-space: nowrap"></td>'