Rename type_ to aperture_type because sphinx doesn't like the trailing underscore

Author: rprospero

sasdata/metadata.py

@@ -148,7 +148,7 @@ class Aperture:
     size: Vec3 | None
     size_name: str | None
     name: str | None
-    type_: str | None
+    aperture_type: str | None
 
     def summary(self):
         return (
@@ -165,7 +165,7 @@ def from_json(obj):
             size=Vec3.from_json(obj["size"]),
             size_name=obj["size_name"],
             name=obj["name"],
-            type_=obj["type"],
+            aperture_type=obj["type"],
         )
 
 
@@ -175,8 +175,8 @@ def as_h5(self, group: h5py.Group):
             self.distance.as_h5(group, "distance")
         if self.name is not None:
             group.attrs["name"] = self.name
-        if self.type_ is not None:
-            group.attrs["type"] = self.type_
+        if self.aperture_type is not None:
+            group.attrs["type"] = self.aperture_type
         if self.size:
             size_group = group.create_group("size")
             self.size.as_h5(size_group)
@@ -642,7 +642,7 @@ def default(self, obj):
                     "size": obj.size,
                     "size_name": obj.size_name,
                     "name": obj.name,
-                    "type": obj.type_,
+                    "type": obj.aperture_type,
                 }
             case Collimation():
                 return {

sasdata/temp_hdf5_reader.py

@@ -149,12 +149,12 @@ def parse_apterture(node : HDF5Group) -> Aperture:
     name = attr_parse(node, "name")
     size = opt_parse(node, "size", parse_vec3)
     size_name = None
-    type_ = attr_parse(node, "type")
+    aperture_type = attr_parse(node, "type")
     if size:
         size_name = attr_parse(node["size"], "name")
     else:
         size_name = None
-    return Aperture(distance=distance, size=size, size_name=size_name, name=name, type_=type_)
+    return Aperture(distance=distance, size=size, size_name=size_name, name=name, aperture_type=aperture_type)
 
 def parse_beam_size(node : HDF5Group) -> BeamSize:
     name = attr_parse(node, "name")

sasdata/temp_xml_reader.py

@@ -169,7 +169,7 @@ def parse_aperture(node: etree._Element, version: str) -> Aperture:
         size=size,
         size_name=size_name,
         name=attr_parse(node, "name"),
-        type_=attr_parse(node, "type"),
+        aperture_type=attr_parse(node, "type"),
     )