- Under Python 3, make sure no binary representations end up in the s…

…tate string used for the tree tag.
zopefoundation · Nov 3, 2017 · bb50e7d · bb50e7d
1 parent 8065190
commit bb50e7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 3.0b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Under Python 3, make sure no binary representations end up in the
+  state string used for the tree tag.
 
 
 3.0b1 (2017-09-15)

diff --git a/src/TreeDisplay/TreeTag.py b/src/TreeDisplay/TreeTag.py
@@ -378,6 +378,11 @@ def tpRenderTABLE(self, id, root_url, url, state, substate, diff, data,
 
             s = encode_str(compress(json.dumps(diff)))  # bytes in ASCII enc.
 
+            # For rendering the encoded state string in a URL under Python 3,
+            # we must lose the "b" prefix by decoding
+            if six.PY3:
+                s = s.decode('ASCII')
+
             script = md['BASEPATH1']
 
             # Propagate extra args through tree.