s/ContainmentMatch2/ContainmentMatch/ to finish old deprecation

Back in the fun days, a v2 existed to fix design issues for the v1.

Now, v2 and v1 are the same implementation, so this is a noop.

Signed-off-by: Brian Harring <ferringb@gmail.com>

Author: ferringb

src/pkgcheck/addons/profiles.py

@@ -247,11 +247,11 @@ def update_cache(self, force=False):
                 for arch in sorted(self.options.arches):
                     stable_key, unstable_key = arch, f"~{arch}"
                     stable_r = packages.PackageRestriction(
-                        "keywords", values.ContainmentMatch2((stable_key,))
+                        "keywords", values.ContainmentMatch((stable_key,))
                     )
                     unstable_r = packages.PackageRestriction(
                         "keywords",
-                        values.ContainmentMatch2(
+                        values.ContainmentMatch(
                             (
                                 stable_key,
                                 unstable_key,

src/pkgcheck/checks/glsa.py

@@ -63,7 +63,7 @@ def feed(self, pkg):
             if vuln.match(pkg):
                 arches = set()
                 for v in collect_package_restrictions(vuln, ["keywords"]):
-                    if isinstance(v.restriction, values.ContainmentMatch2):
+                    if isinstance(v.restriction, values.ContainmentMatch):
                         arches.update(x.lstrip("~") for x in v.restriction.vals)
                     else:
                         raise Exception(

src/pkgcheck/checks/imlate.py

@@ -77,7 +77,7 @@ def __init__(self, *args, stable_arches_addon=None):
             source_arches = self.options.stable_arches
         self.source_arches = frozenset(arch.lstrip("~") for arch in source_arches)
         self.source_filter = packages.PackageRestriction(
-            "keywords", values.ContainmentMatch2(self.source_arches)
+            "keywords", values.ContainmentMatch(self.source_arches)
         )
 
     def feed(self, pkgset):

src/pkgcheck/checks/metadata.py

@@ -1695,7 +1695,7 @@ def __init__(self, *args):
         super().__init__(*args)
         # create "!test? ( test )" conditional to match restrictions against
         self.test_restrict = packages.Conditional(
-            "use", values.ContainmentMatch2("test", negate=True), ["test"]
+            "use", values.ContainmentMatch("test", negate=True), ["test"]
         )
 
     def feed(self, pkg):

src/pkgcheck/checks/python.py

@@ -369,14 +369,14 @@ def scan_tree_recursively(self, deptree, expected_cls):
         yield deptree
 
     def check_required_use(self, requse, flags, prefix, container_cls):
-        for token in self.scan_tree_recursively(requse, values.ContainmentMatch2):
+        for token in self.scan_tree_recursively(requse, values.ContainmentMatch):
             # pkgcore collapses single flag in ||/^^, so expect top-level flags
             # when len(flags) == 1
             if len(flags) > 1 and not isinstance(token, container_cls):
                 continue
             matched = set()
             for x in token:
-                if not isinstance(x, values.ContainmentMatch2):
+                if not isinstance(x, values.ContainmentMatch):
                     continue
                 name = next(iter(x.vals))
                 if name.startswith(prefix):

src/pkgcheck/checks/unstable_only.py

@@ -39,8 +39,8 @@ def __init__(self, *args, stable_arches_addon=None):
         self.arch_restricts = {}
         for arch in arches:
             self.arch_restricts[arch] = [
-                packages.PackageRestriction("keywords", values.ContainmentMatch2((arch,))),
-                packages.PackageRestriction("keywords", values.ContainmentMatch2((f"~{arch}",))),
+                packages.PackageRestriction("keywords", values.ContainmentMatch((arch,))),
+                packages.PackageRestriction("keywords", values.ContainmentMatch((f"~{arch}",))),
             ]
 
     def feed(self, pkgset):