portage.dep.Atom: remove str subtyping

Author: Jannik2099

bin/quickpkg

@@ -71,7 +71,8 @@ def quickpkg_atom(options, infos, arg, eout):
         eout.eerror(f"Invalid atom: {arg}")
         infos["missing"].append(arg)
         return 1
-    if atom[:1] == "=" and arg[:1] != "=":
+    # Check if dep_expand added an operator that wasn't in the original arg
+    if atom.operator == "=" and not str(arg).startswith("="):
         # dep_expand() allows missing '=' but it's really invalid
         eout.eerror(f"Invalid atom: {arg}")
         infos["missing"].append(arg)

lib/_emerge/BlockerCache.py

@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import errno
+from portage.dep import Atom
 from portage.util import writemsg
 from portage.data import secpass
 import portage
@@ -99,10 +100,10 @@ def _load(self):
                     continue
                 invalid_atom = False
                 for atom in atoms:
-                    if not isinstance(atom, str):
+                    if not isinstance(atom, (str, Atom)):
                         invalid_atom = True
                         break
-                    if atom[:1] != "!" or not portage.isvalidatom(
+                    if str(atom)[:1] != "!" or not portage.isvalidatom(
                         atom, allow_blockers=True
                     ):
                         invalid_atom = True

lib/_emerge/BlockerDB.py

@@ -76,8 +76,8 @@ def findInstalledBlockers(self, new_pkg):
                     )
                     continue
 
-                blocker_atoms = [atom for atom in atoms if atom.startswith("!")]
-                blocker_atoms.sort()
+                blocker_atoms = [atom for atom in atoms if atom.blocker]
+                blocker_atoms.sort(key=str)
                 blocker_cache[inst_pkg.cpv] = blocker_cache.BlockerData(
                     inst_pkg.counter, blocker_atoms
                 )
@@ -113,7 +113,7 @@ def findInstalledBlockers(self, new_pkg):
             show_invalid_depstring_notice(new_pkg, atoms)
             assert False
 
-        blocker_atoms = [atom.lstrip("!") for atom in atoms if atom[:1] == "!"]
+        blocker_atoms = [str(atom).lstrip("!") for atom in atoms if atom.blocker]
         if blocker_atoms:
             blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms)
             for inst_pkg in installed_pkgs:

lib/_emerge/actions.py

@@ -1753,16 +1753,16 @@ def action_deselect(settings, trees, opts, atoms):
         expanded_atoms = set(atoms)
 
         for atom in atoms:
-            if not atom.startswith(SETPREFIX):
-                if atom.cp.startswith("null/"):
+            if not str(atom).startswith(SETPREFIX):
+                if atom.category == "null":
                     # try to expand category from world set
                     null_cat, pn = portage.catsplit(atom.cp)
                     for world_atom in world_atoms:
                         cat, world_pn = portage.catsplit(world_atom.cp)
                         if pn == world_pn:
                             expanded_atoms.add(
                                 Atom(
-                                    atom.replace("null", cat, 1),
+                                    str(atom).replace("null", cat, 1),
                                     allow_repo=True,
                                     allow_wildcard=True,
                                 )
@@ -1775,27 +1775,27 @@ def action_deselect(settings, trees, opts, atoms):
         discard_atoms = set()
         for atom in world_set:
             for arg_atom in expanded_atoms:
-                if arg_atom.startswith(SETPREFIX):
-                    if atom.startswith(SETPREFIX) and arg_atom == atom:
+                if str(arg_atom).startswith(SETPREFIX):
+                    if str(atom).startswith(SETPREFIX) and arg_atom == atom:
                         discard_atoms.add(atom)
                         break
                 else:
                     if (
-                        not atom.startswith(SETPREFIX)
+                        not str(atom).startswith(SETPREFIX)
                         and arg_atom.intersects(atom)
                         and not (arg_atom.slot and not atom.slot)
                         and not (arg_atom.repo and not atom.repo)
                     ):
                         discard_atoms.add(atom)
                         break
         if discard_atoms:
-            for atom in sorted(discard_atoms):
+            for atom in sorted(discard_atoms, key=str):
                 if pretend:
                     action_desc = "Would remove"
                 else:
                     action_desc = "Removing"
 
-                if atom.startswith(SETPREFIX):
+                if str(atom).startswith(SETPREFIX):
                     filename = "world_sets"
                 else:
                     filename = "world"
@@ -2095,7 +2095,7 @@ def action_info(settings, trees, myopts, myfiles):
                 if not atom.blocker:
                     atoms.append((x, atom))
 
-    myvars = sorted(set(atoms))
+    myvars = sorted(set(atoms), key=lambda t: str(t[0]))
 
     cp_map = {}
     cp_max_len = 0
@@ -3956,11 +3956,11 @@ def emergeexitsig(signum, frame):
                     # look at the ebuilds, since EAPI 4 allows running pkg_info
                     # on non-installed packages
                     valid_atom = dep_expand(x, mydb=vardb)
-                    if valid_atom.cp.split("/")[0] == "null":
+                    if valid_atom.category == "null":
                         valid_atom = dep_expand(x, mydb=portdb)
 
                     if (
-                        valid_atom.cp.split("/")[0] == "null"
+                        valid_atom.category == "null"
                         and "--usepkg" in emerge_config.opts
                     ):
                         valid_atom = dep_expand(x, mydb=bindb)

lib/_emerge/create_world_atom.py

@@ -113,7 +113,7 @@ def create_world_atom(pkg, args_set, root_config, before_install=False):
         # gcc for example.
         system_atom = sets["system"].findAtomForPackage(pkg)
         if system_atom:
-            if not system_atom.cp.startswith("virtual/"):
+            if system_atom.category != "virtual":
                 return None
             # System virtuals aren't safe to exclude from world since they can
             # match multiple old-style virtuals but only one of them will be

lib/_emerge/depgraph.py

@@ -3663,7 +3663,7 @@ def _add_pkg_soname_deps(self, pkg, allow_unsatisfied=False):
                     continue
                 dep = Dependency(
                     atom=atom,
-                    blocker=False,
+                    blocker=None,
                     depth=depth,
                     parent=pkg,
                     priority=self._priority(cross=self._cross(pkg.root), runtime=True),
@@ -4700,7 +4700,7 @@ def _queue_disjunctive_deps(
                 # Note: Eventually this will check for PROPERTIES=virtual
                 # or whatever other metadata gets implemented for this
                 # purpose.
-                if x.cp.startswith("virtual/"):
+                if x.category == "virtual":
                     disjunctions.append(x)
                 else:
                     yield x
@@ -5121,8 +5121,10 @@ def _select_files(self, myfiles):
                 if len(expanded_atoms) > 1:
                     number_of_virtuals = 0
                     for expanded_atom in expanded_atoms:
-                        if expanded_atom.cp.startswith(
-                            ("acct-group/", "acct-user/", "virtual/")
+                        if expanded_atom.category in (
+                            "acct-group",
+                            "acct-user",
+                            "virtual",
                         ):
                             number_of_virtuals += 1
                         else:
@@ -5152,7 +5154,8 @@ def _select_files(self, myfiles):
                     if virts_p:
                         # Allow the depgraph to choose which virtual.
                         atom = Atom(
-                            null_atom.replace("null/", "virtual/", 1), allow_repo=True
+                            str(null_atom).replace("null/", "virtual/", 1),
+                            allow_repo=True,
                         )
                     else:
                         atom = null_atom
@@ -5304,7 +5307,7 @@ def _resolve(self, myfavorites):
             pprovideddict = pkgsettings.pprovideddict
             virtuals = pkgsettings.getvirtuals()
 
-            for atom in sorted(arg.pset.getAtoms()):
+            for atom in sorted(arg.pset.getAtoms(), key=str):
                 self._spinner_update()
                 dep = Dependency(atom=atom, onlydeps=onlydeps, root=myroot, parent=arg)
                 try:
@@ -5353,7 +5356,7 @@ def _resolve(self, myfavorites):
                         pprovided_match = False
                         for virt_choice in virtuals.get(atom.cp, []):
                             expanded_atom = portage.dep.Atom(
-                                atom.replace(atom.cp, virt_choice.cp, 1)
+                                str(atom).replace(atom.cp, virt_choice.cp, 1)
                             )
                             pprovided = pprovideddict.get(expanded_atom.cp)
                             if pprovided and portage.match_from_list(
@@ -5393,7 +5396,7 @@ def _resolve(self, myfavorites):
                     if atom.cp != pkg.cp:
                         # For old-style virtuals, we need to repeat the
                         # package.provided check against the selected package.
-                        expanded_atom = atom.replace(atom.cp, pkg.cp)
+                        expanded_atom = str(atom).replace(atom.cp, pkg.cp)
                         pprovided = pprovideddict.get(pkg.cp)
                         if pprovided and portage.match_from_list(
                             expanded_atom, pprovided
@@ -5955,7 +5958,7 @@ def _expand_virt_from_graph(self, root, atom):
         if not isinstance(atom, Atom):
             atom = Atom(atom)
 
-        if not atom.cp.startswith("virtual/"):
+        if atom.category != "virtual":
             yield atom
             return
 
@@ -6783,7 +6786,7 @@ def _show_unsatisfied_dep(
             mask_docs = True
         else:
             cp_exists = False
-            if atom.package and not atom.cp.startswith("null/"):
+            if atom.package and atom.category != "null":
                 for pkg in self._iter_match_pkgs_any(root_config, Atom(atom.cp)):
                     cp_exists = True
                     break
@@ -8453,7 +8456,7 @@ def _complete_graph(self, required_sets=None):
 
         self._set_args(args)
         for arg in self._expand_set_args(args, add_to_digraph=True):
-            for atom in sorted(arg.pset.getAtoms()):
+            for atom in sorted(arg.pset.getAtoms(), key=str):
                 if not self._add_dep(
                     Dependency(
                         atom=atom,
@@ -8766,7 +8769,7 @@ def _validate_blockers(self):
                             show_invalid_depstring_notice(pkg, atoms)
                             return False
                         blocker_atoms = [myatom for myatom in atoms if myatom.blocker]
-                        blocker_atoms.sort()
+                        blocker_atoms.sort(key=str)
                         blocker_cache[cpv] = blocker_cache.BlockerData(
                             pkg.counter, blocker_atoms
                         )
@@ -11193,7 +11196,7 @@ def _loadResumeCommand(self, resume_data, skip_masked=True, skip_missing=True):
             # added via _add_pkg() so that they are included in the
             # digraph (needed at least for --tree display).
             for arg in self._expand_set_args(args, add_to_digraph=True):
-                for atom in sorted(arg.pset.getAtoms()):
+                for atom in sorted(arg.pset.getAtoms(), key=str):
                     pkg, existing_node = self._select_package(
                         arg.root_config.root, atom
                     )
@@ -11495,7 +11498,7 @@ def match_pkgs(self, atom):
         if (
             pkg is not None
             and atom.sub_slot is None
-            and pkg.cp.startswith("virtual/")
+            and pkg.category == "virtual"
             and (
                 (
                     "remove" not in self._depgraph._dynamic_config.myparams
@@ -11587,7 +11590,7 @@ def _visible(self, pkg, atom_set, avoid_slot_conflict=True, probe_virt_update=Tr
                 if not self._depgraph._equiv_ebuild_visible(pkg):
                     return False
 
-        if pkg.cp.startswith("virtual/"):
+        if pkg.category == "virtual":
             if not self._depgraph._virt_deps_visible(pkg, ignore_use=True):
                 return False
 

lib/_emerge/resolver/output.py

@@ -1,8 +1,7 @@
 # Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-"""Resolver output display operation.
-"""
+"""Resolver output display operation."""
 
 __all__ = (
     "Display",
@@ -951,7 +950,7 @@ def format_unmatched_atom(pkg, atom, pkg_use_enabled):
     def perform_coloring():
         atom_str = ""
         marker_str = ""
-        for ii, x in enumerate(atom):
+        for ii, x in enumerate(str(atom)):
             if ii in highlight:
                 atom_str += colorize("BAD", x)
                 marker_str += "^"
@@ -962,7 +961,7 @@ def perform_coloring():
 
     if atom.cp != pkg.cp:
         # Highlight the cp part only.
-        ii = atom.find(atom.cp)
+        ii = str(atom).find(atom.cp)
         highlight.update(range(ii, ii + len(atom.cp)))
         return perform_coloring()
 
@@ -992,7 +991,7 @@ def perform_coloring():
             highlight.update(range(len(op)))
 
         if ver is not None:
-            start = atom.rfind(ver)
+            start = str(atom).rfind(ver)
             end = start + len(ver)
             highlight.update(range(start, end))
 
@@ -1002,7 +1001,7 @@ def perform_coloring():
             slot_str += "/" + atom.sub_slot
         if atom.slot_operator:
             slot_str += atom.slot_operator
-        start = atom.find(slot_str)
+        start = str(atom).find(slot_str)
         end = start + len(slot_str)
         highlight.update(range(start, end))
 
@@ -1025,7 +1024,7 @@ def perform_coloring():
                     )
 
     if highlight_use:
-        ii = atom.find("[") + 1
+        ii = str(atom).find("[") + 1
         for token in atom.use.tokens:
             if token.lstrip("-!").rstrip("=?") in highlight_use:
                 highlight.update(range(ii, ii + len(token)))

lib/_emerge/unmerge.py

@@ -122,8 +122,9 @@ def _pkg(cpv):
                 print(f"\nNo packages to {unmerge_action} have been provided.\n")
                 return 1, {}
             for x in unmerge_files:
-                arg_parts = x.split("/")
-                if x[0] not in [".", "/"] and arg_parts[-1][-7:] != ".ebuild":
+                x_str = str(x)  # this could be an Atom, stringify
+                arg_parts = x_str.split("/")
+                if x_str[0] not in [".", "/"] and arg_parts[-1][-7:] != ".ebuild":
                     # possible cat/pkg or dep; treat as such
                     candidate_catpkgs.append(x)
                 elif unmerge_action in ["prune", "clean"]:

lib/portage/_sets/ProfilePackageSet.py

@@ -40,7 +40,7 @@ def load(self):
                 ],
                 incremental=1,
             )
-            if x[:1] != "*"
+            if str(x)[:1] != "*"
         )
 
     def singleBuilder(self, options, settings, trees):

lib/portage/_sets/base.py

@@ -129,7 +129,7 @@ def findAtomForPackage(self, pkg, modified_use=None):
             else:
                 rev_transform[
                     Atom(
-                        atom.replace(atom.cp, pkg.cp, 1),
+                        str(atom).replace(atom.cp, pkg.cp, 1),
                         allow_wildcard=True,
                         allow_repo=True,
                     )