Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
- Unused `_processing` module

### Fixed
- `dtype_to_pvp_element`/`dtype_to_ppp_element`failures due to dtype endianness in `sarkit.cphd` and `sarkit.crsd`


## [1.10.1] - 2026-07-31

Expand Down
2 changes: 1 addition & 1 deletion sarkit/cphd/_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def set_elem(self, elem: lxml.etree.Element, val: dict) -> None:
"""
local_val = copy.deepcopy(val)
dtype = local_val.setdefault("dtype", self.dtype)
if dtype != self.dtype:
if dtype.newbyteorder("=") != self.dtype:
raise ValueError(f"Invalid {dtype=}; expected {self.dtype}")
size = local_val.setdefault("Size", self.dtype.itemsize // 8)
if size != self.dtype.itemsize // 8:
Expand Down
11 changes: 11 additions & 0 deletions tests/core/cphd/test_pvps.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,14 @@ def test_pvp_dtype_element_roundtrip(basis_xml):
ew["PVP"] = skcphd.dtype_to_pvp_element(basis_version, new_dtype)
assert ew["PVP"].find("AddedPVP", Name="NewField") is not None
schema.assertValid(basis_etree)


def test_dtype_to_pvp_element(example_cphd):
with example_cphd.open("rb") as f, skcphd.Reader(f) as r:
pvps = r.read_pvps(r.metadata.xmltree.findtext(".//{*}RefChId"))
ew = skcphd.ElementWrapper(r.metadata.xmltree.getroot())
ew["PVP"] = skcphd.dtype_to_pvp_element(
lxml.etree.QName(r.metadata.xmltree.getroot()).namespace, pvps.dtype
)
new_dtype = skcphd.get_pvp_dtype(ew.elem.getroottree())
assert pvps.dtype.newbyteorder("=") == new_dtype.newbyteorder("=")
22 changes: 22 additions & 0 deletions tests/core/crsd/test_pxps.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,25 @@ def test_pvp_dtype_element_roundtrip():
ew["PVP"] = skcrsd.dtype_to_pvp_element(basis_version, new_dtype)
assert ew["PVP"].find("AddedPVP", Name="NewField") is not None
schema.assertValid(basis_etree)


def test_dtype_to_pvp_element(example_crsdsar):
with example_crsdsar.open("rb") as f, skcrsd.Reader(f) as r:
pvps = r.read_pvps(r.metadata.xmltree.findtext(".//{*}RefChId"))
ew = skcrsd.ElementWrapper(r.metadata.xmltree.getroot())
ew["PVP"] = skcrsd.dtype_to_pvp_element(
lxml.etree.QName(r.metadata.xmltree.getroot()).namespace, pvps.dtype
)
new_dtype = skcrsd.get_pvp_dtype(ew.elem.getroottree())
assert pvps.dtype.newbyteorder("=") == new_dtype.newbyteorder("=")


def test_dtype_to_ppp_element(example_crsdsar):
with example_crsdsar.open("rb") as f, skcrsd.Reader(f) as r:
ppps = r.read_ppps(r.metadata.xmltree.findtext(".//{*}RefTxId"))
ew = skcrsd.ElementWrapper(r.metadata.xmltree.getroot())
ew["PPP"] = skcrsd.dtype_to_ppp_element(
lxml.etree.QName(r.metadata.xmltree.getroot()).namespace, ppps.dtype
)
new_dtype = skcrsd.get_ppp_dtype(ew.elem.getroottree())
assert ppps.dtype.newbyteorder("=") == new_dtype.newbyteorder("=")