dep: support __contains__(str) for dependency types

Author: radhermit

src/pkgcraft/C.pxd

@@ -815,6 +815,12 @@ cdef extern from "pkgcraft.h":
     # The arguments must be valid Dependency pointers.
     bool pkgcraft_dependency_contains_dependency(Dependency *d1, Dependency *d2)
 
+    # Determine if a Dependency contains a given raw string.
+    #
+    # # Safety
+    # The arguments must be valid pointers.
+    bool pkgcraft_dependency_contains_str(Dependency *d, const char *s)
+
     # Evaluate a Dependency.
     #
     # # Safety
@@ -908,6 +914,12 @@ cdef extern from "pkgcraft.h":
     # The arguments must be valid DependencySet and Dependency pointers.
     bool pkgcraft_dependency_set_contains_dependency(DependencySet *s, Dependency *d)
 
+    # Determine if a DependencySet contains a given raw string.
+    #
+    # # Safety
+    # The arguments must be valid pointers.
+    bool pkgcraft_dependency_set_contains_str(DependencySet *d, const char *s)
+
     # Determine if two DependencySets are equal.
     #
     # # Safety

src/pkgcraft/dep/base.pyx

@@ -145,6 +145,8 @@ cdef class Dependency:
     def __contains__(self, obj):
         if isinstance(obj, Dependency):
             return C.pkgcraft_dependency_contains_dependency(self.ptr, (<Dependency>obj).ptr)
+        elif isinstance(obj, str):
+            return C.pkgcraft_dependency_contains_str(self.ptr, obj.encode())
         return False
 
     def __iter__(self):
@@ -395,15 +397,10 @@ cdef class DependencySet:
         return depset
 
     def __contains__(self, obj):
-        cdef Dependency dep = None
-
         if isinstance(obj, Dependency):
-            dep = obj
+            return C.pkgcraft_dependency_set_contains_dependency(self.ptr, (<Dependency>obj).ptr)
         elif isinstance(obj, str):
-            dep = Dependency(obj, set=self.set)
-
-        if dep is not None:
-            return C.pkgcraft_dependency_set_contains_dependency(self.ptr, dep.ptr)
+            return C.pkgcraft_dependency_set_contains_str(self.ptr, obj.encode())
         return False
 
     def __iter__(self):

tests/dep/test_base.py

@@ -159,6 +159,10 @@ def test_contains(self):
         assert Dependency.required_use("u2? ( b )") in d
         assert Dependency.required_use("b") not in d
 
+        # substrings
+        assert "u2?" in d
+        assert "b ) )" in d
+
         # non-Dependency objects return False
         assert None not in d
 
@@ -416,10 +420,14 @@ def test_contains(self):
         assert Dependency("a/b") in self.cls("a/b")
         assert Dependency("a/b") not in self.cls("u? ( a/b )")
 
-        # valid Dependency strings work
+        # valid Dependency objects
         assert "a/b" in self.cls("a/b")
         assert "u? ( c/d )" in self.cls("a/b u? ( c/d )")
 
+        # substrings
+        assert "u?" in self.cls("a/b u? ( c/d )")
+        assert " ( " in self.cls("a/b u? ( c/d )")
+
         # all other object types return False
         assert None not in self.cls("a/b")