Resolved conflicts with spack#36347

lib/spack/spack/solver/asp.py

@@ -126,7 +126,6 @@ def __str__(self):
         return f"{self._name_.lower()}"
 
 
-
 DeclaredVersion = collections.namedtuple("DeclaredVersion", ["version", "idx", "origin"])
 
 
@@ -2188,9 +2187,7 @@ def setup(self, driver, specs, reuse=None):
         self.add_concrete_versions_from_specs(dev_specs, Provenance.DEV_SPEC)
 
         req_version_specs = _get_versioned_specs_from_pkg_requirements()
-        self.add_concrete_versions_from_specs(
-            req_version_specs, Provenance.PACKAGE_REQUIREMENT
-        )
+        self.add_concrete_versions_from_specs(req_version_specs, Provenance.PACKAGE_REQUIREMENT)
 
         self.gen.h1("Concrete input spec definitions")
         self.define_concrete_input_specs(specs, possible)
@@ -2294,8 +2291,8 @@ def _specs_from_requires(pkg_name, section):
                 spec_strs.append(spec_group)
             else:
                 # Otherwise it is a one_of or any_of: get the values
-                (x,) = spec_group.values()
-                spec_strs.extend(x)
+                key = "one_of" if "one_of" in spec_group else "any_of"
+                spec_strs.extend(spec_group[key])
 
         extracted_specs = []
         for spec_str in spec_strs: