py2/py3: make HBTreeFolder2 code compatible.

dba0a578 · Kazuhiko Shiozaki · Jérome Perrin · 4e670e86 · dba0a578
Commit dba0a578 authored Oct 05, 2022 by Kazuhiko Shiozaki Committed by Jérome Perrin May 27, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

product/HBTreeFolder2/HBTreeFolder2.py product/HBTreeFolder2/HBTreeFolder2.py +4 -1

No files found.
--- a/product/HBTreeFolder2/HBTreeFolder2.py
+++ b/product/HBTreeFolder2/HBTreeFolder2.py
@@ -423,7 +423,10 @@ class HBTreeFolder2Base (Persistent):
                    s.append((k, six.iteritems(v)))
                break
              s.append((k, six.iteritems(v)))
-        r.sort()
+        if six.PY2:
+          r.sort()
+        else:
+          r.sort(key=lambda e: '' if e is None else e)
        return r

    security.declareProtected(access_contents_information,