Merge branch 'master' into re-62-migrate-manage_catalogIndexes-to-zpt

zopefoundation · May 10, 2019 · 28faff8 · 28faff8
2 parents be861ac + 390eebe
commit 28faff8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Products/ZCTextIndex/WidCode.py b/src/Products/ZCTextIndex/WidCode.py
@@ -58,6 +58,7 @@
 #    1abcdefg 0hijkLmn 0opqrstu 0vwxyzAB
 
 import re
+import six
 
 
 def encode(wids):
@@ -87,7 +88,7 @@ def _encode(w):
 
 def decode(code):
     # Handle bytes that were not properly decoded during Python 3 conversion
-    if not isinstance(code, str):
+    if six.PY3 and isinstance(code, six.binary_type):
         code = code.decode('latin1')
     # Decode a string into a list of wids.
     get = _decoding.get