🐛 Fix TypeError arising when argument to str.startswith, endswith or …

…find is 'bytes' rather than 'str'
twisted · Feb 23, 2024 · 3c76f01 · 3c76f01
1 parent 4bfe289
commit 3c76f01
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ldaptor/entryhelpers.py b/ldaptor/entryhelpers.py
@@ -173,7 +173,7 @@ def match(self, filter):
                 possibleMatches = [
                     x[len(filter.substrings[0].value) :]
                     for x in possibleMatches
-                    if x.lower().startswith(filter.substrings[0].value.lower())
+                    if x.lower().startswith(filter.substrings[0].value.decode().lower())
                 ]
                 del substrings[0]
 
@@ -183,15 +183,15 @@ def match(self, filter):
                 possibleMatches = [
                     x[: -len(filter.substrings[0].value)]
                     for x in possibleMatches
-                    if x.lower().endswith(filter.substrings[-1].value.lower())
+                    if x.lower().endswith(filter.substrings[-1].value.decode().lower())
                 ]
                 del substrings[-1]
 
             while possibleMatches and substrings:
                 assert isinstance(substrings[0], pureldap.LDAPFilter_substrings_any)
                 r = []
                 for possible in possibleMatches:
-                    i = possible.lower().find(substrings[0].value.lower())
+                    i = possible.lower().find(substrings[0].value.decode().lower())
                     if i >= 0:
                         r.append(possible[i:])
                 possibleMatches = r