From 6716d727e9bb186e28c8fee997eee8b690985162 Mon Sep 17 00:00:00 2001 From: Daniel Pressler Date: Thu, 9 Jan 2025 08:14:48 -0700 Subject: [PATCH] appease new ruff formatting --- sarkit/standards/general/nitf_elements/image.py | 3 +-- sarkit/standards/sidd/io.py | 8 ++++---- sarkit/standards/xml.py | 2 +- sarkit/verification/cphd_consistency.py | 2 +- sarkit/verification/sicd_consistency.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sarkit/standards/general/nitf_elements/image.py b/sarkit/standards/general/nitf_elements/image.py index cec7b56..95374ad 100644 --- a/sarkit/standards/general/nitf_elements/image.py +++ b/sarkit/standards/general/nitf_elements/image.py @@ -71,8 +71,7 @@ class ImageBand(NITFElement): True, 3, default_value="", - docstring="Standard Image Filter Code. This field is reserved " - "for future use.", + docstring="Standard Image Filter Code. This field is reserved for future use.", ) # type: str def __init__(self, **kwargs): diff --git a/sarkit/standards/sidd/io.py b/sarkit/standards/sidd/io.py index 30948df..76cceb5 100644 --- a/sarkit/standards/sidd/io.py +++ b/sarkit/standards/sidd/io.py @@ -924,7 +924,7 @@ def segmentation_algorithm( idlvl=z, ialvl=0, iloc="0000000000", - iid1=f"SIDD{k+1:03d}001", # Document says 'm', but there is no m variable + iid1=f"SIDD{k + 1:03d}001", # Document says 'm', but there is no m variable nrows=num_rows_k, ncols=num_cols_k, ) @@ -939,7 +939,7 @@ def segmentation_algorithm( idlvl=z, ialvl=0, iloc="0000000000", - iid1=f"SIDD{k+1:03d}001", # Document says 'm', but there is no m variable + iid1=f"SIDD{k + 1:03d}001", # Document says 'm', but there is no m variable nrows=num_rows_limit_k, ncols=num_cols_k, ) @@ -952,7 +952,7 @@ def segmentation_algorithm( idlvl=z, ialvl=z - 1, iloc=f"{num_rows_limit_k:05d}00000", - iid1=f"SIDD{k+1:03d}{n+1:03d}", + iid1=f"SIDD{k + 1:03d}{n + 1:03d}", nrows=num_rows_limit_k, ncols=num_cols_k, ) @@ -965,7 +965,7 @@ def segmentation_algorithm( idlvl=z, ialvl=z - 1, iloc=f"{num_rows_limit_k:05d}00000", # Document says "lastSegRows", but we need the number of rows in the previous IS - iid1=f"SIDD{k+1:03d}{num_seg_per_image_k:03d}", + iid1=f"SIDD{k + 1:03d}{num_seg_per_image_k:03d}", nrows=last_seg_rows, ncols=num_cols_k, ) diff --git a/sarkit/standards/xml.py b/sarkit/standards/xml.py index 3e7c5d2..65acc2b 100644 --- a/sarkit/standards/xml.py +++ b/sarkit/standards/xml.py @@ -193,7 +193,7 @@ def set_elem(self, elem: lxml.etree.Element, val: npt.ArrayLike) -> None: elem_ns = self.child_ns if self.child_ns else lxml.etree.QName(elem).namespace ns = f"{{{elem_ns}}}" if elem_ns else "" for dim, ncoef in enumerate(coefs.shape): - elem.set(f"order{dim+1}", str(ncoef - 1)) + elem.set(f"order{dim + 1}", str(ncoef - 1)) for coord, coef in np.ndenumerate(coefs): attribs = {f"exponent{d + 1}": str(c) for d, c in enumerate(coord)} lxml.etree.SubElement(elem, ns + "Coef", attrib=attribs).text = str(coef) diff --git a/sarkit/verification/cphd_consistency.py b/sarkit/verification/cphd_consistency.py index 8db4102..325df7b 100644 --- a/sarkit/verification/cphd_consistency.py +++ b/sarkit/verification/cphd_consistency.py @@ -1317,7 +1317,7 @@ def check_pad_after_xml(self): bytes_after_xml = fp.read(num_bytes_after_xml) terminator = bytes_after_xml[:2] pad = np.array( - struct.unpack(f"{num_bytes_after_xml-2}B", bytes_after_xml[2:]) + struct.unpack(f"{num_bytes_after_xml - 2}B", bytes_after_xml[2:]) ) with self.need("Section terminator exists"): diff --git a/sarkit/verification/sicd_consistency.py b/sarkit/verification/sicd_consistency.py index 13561ad..1a83615 100644 --- a/sarkit/verification/sicd_consistency.py +++ b/sarkit/verification/sicd_consistency.py @@ -381,7 +381,7 @@ def check_nitf_imseg(self) -> None: assert imsegs[0].IID1.rstrip() == "SICD000" else: expected_iid1s = [ - f"SICD{idx+1:03d} " for idx in range(len(imsegs)) + f"SICD{idx + 1:03d} " for idx in range(len(imsegs)) ] actual_iid1s = [imseg.IID1 for imseg in imsegs] assert actual_iid1s == expected_iid1s