pick fix from https://github.com/zopefoundation/Products.ZCatalog/pul… (

#116) * pick fix from #79 to fix #114
zopefoundation · Jan 29, 2021 · 91e7826 · 91e7826
1 parent 357bb21
commit 91e7826
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,8 +4,10 @@ Changelog
 5.3 (unreleased)
 ----------------
 
-- Add support for Python 3.9.
+- Fix case where multiple indexes with similar name seperated by ``_`` were interpreted as options
+  (`#78 <https://github.com/zopefoundation/Products.ZCatalog/issues/78>`_).
 
+- Add support for Python 3.9.
 
 5.2 (2020-10-09)
 ----------------

diff --git a/src/Products/ZCatalog/query.py b/src/Products/ZCatalog/query.py
@@ -88,8 +88,7 @@ def __init__(self, request, iid, options=(), operators=('or', 'and'),
 
             for field in request.keys():
                 if field.startswith(iid + '_'):
-                    iid_tmp, op = field.split('_')
-
+                    op = field[len(iid) + 1:]
                     self.set(op, request[field])
 
         self.keys = keys