Merge pull request #184 from plone/fix/155-remove-dead-code-subject

Remove Subject index modifier (Python 2 leftover)

Author: davisagli

news/155.internal

@@ -0,0 +1,2 @@
+Remove Subject index modifier — a Python 2 leftover that was already a no-op.
+@jensens

src/plone/app/querystring/indexmodifiers/configure.zcml

@@ -3,11 +3,6 @@
     i18n_domain="plone"
     >
 
-  <utility
-      factory=".query_index_modifiers.Subject"
-      provides="..interfaces.IParsedQueryIndexModifier"
-      name="Subject"
-      />
   <utility
       factory=".query_index_modifiers.Date"
       provides="..interfaces.IParsedQueryIndexModifier"

src/plone/app/querystring/indexmodifiers/query_index_modifiers.py

@@ -3,51 +3,6 @@
 from zope.interface import implementer
 
 
-@implementer(IParsedQueryIndexModifier)
-class Subject:
-    """
-    The Subject field in Plone currently uses a utf-8 encoded string.
-    When a catalog query tries to compare a unicode string from the
-    parsedquery with existing utf-8 encoded string indexes unindexing
-    will fail with a UnicodeDecodeError. To prevent this from happening
-    we always encode the Subject query.
-
-    XXX: As soon as Plone uses unicode for all indexes, this code can
-    be removed.
-    """
-
-    def __call__(self, value):
-        return ("Subject", value)
-
-        # Get the query operator
-        op = None
-        if "query" in value:
-            op = "query"
-        elif "not" in value:
-            op = "not"
-
-        query = value[op]
-        # query can be a unicode string or a list of unicode strings.
-        if isinstance(query, str):
-            query = query.encode("utf-8")
-        elif isinstance(query, list):
-            # We do not want to change the collections' own query string,
-            # therefore we create a new copy of the list.
-            copy_of_query = list(query)
-            # Iterate over all query items and encode them if they are
-            # unicode strings
-            i = 0
-            for item in copy_of_query:
-                if isinstance(item, str):
-                    copy_of_query[i] = item.encode("utf-8")
-                i += 1
-            query = copy_of_query
-        else:
-            pass
-        value[op] = query
-        return ("Subject", value)
-
-
 @implementer(IParsedQueryIndexModifier)
 class base:
     """DateIndex query modifier

src/plone/app/querystring/tests/testIndexmodifiers.py

@@ -6,24 +6,6 @@
 
 
 class TestIndexModifiers(unittest.TestCase):
-    def test_subject_encoded(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"query": "foobar"}),
-            ("Subject", {"query": "foobar"}),
-        )
-
-    def test_subject_encoded__list(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"query": ["foobar"]}),
-            ("Subject", {"query": ["foobar"]}),
-        )
-
-    def test_subject_encoded__list_not(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"not": ["foobar"]}),
-            ("Subject", {"not": ["foobar"]}),
-        )
-
     def test_date_modifier(self):
         modifier = query_index_modifiers.start()
         self.assertTrue(