diff --git a/sasdata/data_util/nxsunit.py b/sasdata/data_util/nxsunit.py index 422d301bd..a5c3ab536 100644 --- a/sasdata/data_util/nxsunit.py +++ b/sasdata/data_util/nxsunit.py @@ -317,7 +317,7 @@ def _format_unit_structure(unit: str | None = None) -> list[str]: all_prefixes = list(PREFIX.keys()) all_prefixes.extend(list(SHORT_PREFIX.keys())) for prefix in all_prefixes: - unit = unit.replace(prefix + "*", prefix) + unit = unit.replace("".join([prefix, "*"]), prefix) # a^-m*b^-n -> a^-m b^-n unit = unit.replace('*', ' ') # invUnit or 1/unit -> /unit diff --git a/sasdata/dataloader/readers/cansas_reader.py b/sasdata/dataloader/readers/cansas_reader.py index be1baf600..f79ee62b0 100644 --- a/sasdata/dataloader/readers/cansas_reader.py +++ b/sasdata/dataloader/readers/cansas_reader.py @@ -194,13 +194,13 @@ def _parse_entry(self, dom: ElementTree, recurse: bool | None = False) -> (Data1 self.current_datainfo.meta_data["loader"] = "CanSAS XML 1D" self.current_datainfo.meta_data[ PREPROCESS] = self.processing_instructions - self.base_ns = "{" + CANSAS_NS.get(self.cansas_version).get("ns") + "}" + self.base_ns = "".join(["{", CANSAS_NS.get(self.cansas_version).get("ns"), "}"]) if self._is_call_local() and not recurse: self.current_datainfo.filename = self.filepath.name # Create an empty dataset if no data has been passed to the reader if self.current_dataset is None: self._initialize_new_data_set(dom) - self.base_ns = "{" + CANSAS_NS.get(self.cansas_version).get("ns") + "}" + self.base_ns = "".join(["{", CANSAS_NS.get(self.cansas_version).get("ns"), "}"]) # Loop through each child in the parent element for node in dom: