Cleanup

Author: cthoyt

src/pyobo/struct/functional/obo_to_functional.py

@@ -69,7 +69,7 @@ def get_ontology_axioms(obo_ontology: Obo) -> Iterable[f.Box]:
 
     if obo_ontology.subsetdefs:
         yield f.Declaration("oboInOwl:SubsetProperty", type="AnnotationProperty")
-        for subset_typedef, subset_label in obo_ontology.subsetdefs:
+        for subset_typedef, subset_label in obo_ontology.subsetdefs.items():
             yield f.Declaration(subset_typedef, type="AnnotationProperty")
             yield m.LabelMacro(subset_typedef, subset_label)
             yield f.SubAnnotationPropertyOf(subset_typedef, "oboInOwl:SubsetProperty")

src/pyobo/struct/struct.py

@@ -696,7 +696,7 @@ def _get_prefixes(self) -> set[str]:
             prefixes.update(stanza._get_prefixes())
         for synonym_typedef in self.synonym_typedefs or []:
             prefixes.update(synonym_typedef._get_prefixes())
-        prefixes.update(subset.prefix for subset, _ in self.subsetdefs or [])
+        prefixes.update(subset.prefix for subset in self.subsetdefs or [])
         # _iterate_property_pairs covers metadata, root terms,
         # and properties in self.property_values
         prefixes.update(_get_prefixes_from_annotations(self._iterate_property_pairs()))
@@ -881,7 +881,7 @@ def iterate_obo_lines(
         for imp in self.imports or []:
             yield f"import: {imp}"
         # 7
-        for subset, subset_remark in self.subsetdefs or []:
+        for subset, subset_remark in (self.subsetdefs or {}).items():
             yield f'subsetdef: {reference_escape(subset, ontology_prefix=self.ontology)} "{subset_remark}"'
         # 8
         for synonym_typedef in sorted(self.synonym_typedefs or []):
@@ -2400,7 +2400,7 @@ def build_ontology(
     version: str | None = None,
     idspaces: dict[str, str] | None = None,
     root_terms: list[Reference] | None = None,
-    subsetdefs: list[tuple[Reference, str]] | None = None,
+    subsetdefs: dict[Reference, str] | None = None,
     properties: list[Annotation] | None = None,
     imports: list[str] | None = None,
     description: str | None = None,
@@ -2485,7 +2485,7 @@ def make_ad_hoc_ontology(
     _data_version: str | None = None,
     _idspaces: Mapping[str, str] | None = None,
     _root_terms: list[Reference] | None = None,
-    _subsetdefs: list[tuple[Reference, str]] | None = None,
+    _subsetdefs: dict[Reference, str] | None = None,
     _property_values: list[Annotation] | None = None,
     _imports: list[str] | None = None,
     _ontology_iri: str | None = None,