diff --git a/olaf/common/oresat_file.py b/olaf/common/oresat_file.py index f4939ff..43f3e03 100644 --- a/olaf/common/oresat_file.py +++ b/olaf/common/oresat_file.py @@ -7,7 +7,7 @@ def new_oresat_file(keyword: str, card: str = "", date: float = -1.0, ext: str = "") -> str: """ - Convience function for making valid oresat file_names + Convenience function for making valid oresat file names. Parameters ---------- diff --git a/olaf/common/oresat_file_cache.py b/olaf/common/oresat_file_cache.py index 6263c7a..0f49cce 100644 --- a/olaf/common/oresat_file_cache.py +++ b/olaf/common/oresat_file_cache.py @@ -7,7 +7,6 @@ from pathlib import Path from threading import Lock -from . import natsorted from .oresat_file import OreSatFile @@ -37,7 +36,7 @@ def __init__(self, dir_path: str): self._data.append(oresat_file) except Exception: # pylint: disable=W0718 remove(self._dir + f) # invalid file name - self._data = natsorted(self._data) + self._data = sorted(self._data) def __len__(self) -> int: with self._lock: @@ -78,7 +77,7 @@ def add(self, file_path: str, consume: bool = False): if not overwrite: self._data.append(oresat_file) - self._data = natsorted(self._data) + self._data = sorted(self._data) def remove(self, file_name: str): """Remove a file from cache diff --git a/tests/internals/resources/test_fread.py b/tests/internals/resources/test_fread.py index 0452e7c..46e64f4 100644 --- a/tests/internals/resources/test_fread.py +++ b/tests/internals/resources/test_fread.py @@ -6,7 +6,7 @@ import unittest from os.path import basename -from olaf import natsorted, new_oresat_file +from olaf import new_oresat_file from olaf._internals.resources.fread import FreadResource from . import MockApp @@ -88,7 +88,7 @@ def test_read(self): self.assertEqual(self.app.sdo_read(index, subindex_file_data).decode(), file_data2) self.assertEqual(self.app.sdo_read(index, subindex_len), 2) file_names = json.loads(self.app.sdo_read(index, subindex_files_json)) - self.assertListEqual(file_names, natsorted([file_name, file_name2])) + self.assertListEqual(file_names, [file_name, file_name2]) # delete the first file self.app.sdo_write(index, subindex_file_name, basename(file_name)) diff --git a/tests/internals/resources/test_fwrite.py b/tests/internals/resources/test_fwrite.py index b31e89f..9abadd7 100644 --- a/tests/internals/resources/test_fwrite.py +++ b/tests/internals/resources/test_fwrite.py @@ -7,7 +7,7 @@ from os import remove from os.path import basename -from olaf import natsorted, new_oresat_file +from olaf import new_oresat_file from olaf._internals.resources.fwrite import FwriteResource from . import MockApp @@ -77,7 +77,7 @@ def test_write(self): self.assertEqual(len(self.app.node.fwrite_cache), 2) self.assertEqual(self.app.sdo_read(index, subindex_len), 2) file_names = json.loads(self.app.sdo_read(index, subindex_files_json)) - self.assertListEqual(file_names, natsorted([file_name, file_name2])) + self.assertListEqual(file_names, [file_name, file_name2]) # remove test file remove(file_path2)