ImageIOHandler: removed add_change_path and adapt_path methods

Author: PierreRaybaut

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog #
 
+## Version 2.2.1 ##
+
+Changes:
+
+* Image plot items deserialization:
+  * When an image plot item is deserialized, and needs to be reloaded from a file,
+    the file path is adapted to the current working directory if file is not found
+    (this is the legacy behavior).
+  * An unnecessary call to `ImageIOHandler.adapt_path` method was removed from the
+    `RawImageItem.deserialize` method: this issue has to be handled by the host
+    application, not by the PlotPy library.
+  * `ImageIOHandler`: removed `add_change_path` and `adapt_path` methods
+
 ## Version 2.2.0 ##
 
 In this release, test coverage is 75%.

plotpy/__init__.py

@@ -20,7 +20,7 @@
 .. _GitHub: https://github.com/PierreRaybaut/plotpy
 """
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __VERSION__ = tuple([int(number) for number in __version__.split(".")])
 
 # --- Important note: DATAPATH and LOCALEPATH are used by guidata.configtools

plotpy/io.py

@@ -136,8 +136,6 @@ class ImageIOHandler:
 
     def __init__(self):
         self.filetypes = []
-        self.select_func = None
-        self.prec_path = None  # le précédent path proposé pour actualisation
 
     def allfilters(self, action, dtype, template):
         """
@@ -226,34 +224,6 @@ def get_writefunc(self, ext):
         else:
             return ftype.write_func
 
-    def add_change_path(self, select_func):
-        self.select_func = select_func
-
-    def adapt_path(self, filename):
-        """Change le path du fichier si nécessaire avec l'aide de l'utilisateur"""
-        if not osp.exists(filename):
-            old_path = osp.dirname(filename)
-            basename = osp.basename(filename)
-            if self.prec_path is None:
-                # on demande à l'utilisateur
-                self.prec_path = self.select_func(old_path, basename)
-
-            # on essait avec le path proposé
-            filename = osp.join(self.prec_path, basename)
-            if not osp.exists(filename):
-                # on essait avec le path proposé et la fin du path précédent
-                # (cas de la double numérisation)
-                head, tail = osp.split(old_path)
-                filename = osp.join(self.prec_path, tail, basename)
-                if not osp.exists(filename):
-                    raise ImportError(
-                        "le fichier "
-                        + basename
-                        + " n'a pas été trouvé dans le répertoire"
-                        + self.prec_path
-                    )
-        return filename
-
 
 iohandler = ImageIOHandler()
 
@@ -689,9 +659,11 @@ def item_name_from_object(obj: Any) -> str | None:
 
 
 def save_item(
-    writer: guidata.dataset.io.HDF5Writer
-    | guidata.dataset.io.INIWriter
-    | guidata.dataset.io.JSONWriter,
+    writer: (
+        guidata.dataset.io.HDF5Writer
+        | guidata.dataset.io.INIWriter
+        | guidata.dataset.io.JSONWriter
+    ),
     group_name,
     item: Any,
 ) -> None:
@@ -712,9 +684,11 @@ def save_item(
 
 
 def load_item(
-    reader: guidata.dataset.io.HDF5Reader
-    | guidata.dataset.io.INIReader
-    | guidata.dataset.io.JSONReader,
+    reader: (
+        guidata.dataset.io.HDF5Reader
+        | guidata.dataset.io.INIReader
+        | guidata.dataset.io.JSONReader
+    ),
     group_name,
 ) -> Any | None:
     """Load plot item from HDF5, INI or JSON file
@@ -740,9 +714,11 @@ def load_item(
 
 
 def save_items(
-    writer: guidata.dataset.io.HDF5Writer
-    | guidata.dataset.io.INIWriter
-    | guidata.dataset.io.JSONWriter,
+    writer: (
+        guidata.dataset.io.HDF5Writer
+        | guidata.dataset.io.INIWriter
+        | guidata.dataset.io.JSONWriter
+    ),
     items: list[Any],
 ) -> None:
     """Save items to HDF5, INI or JSON file
@@ -769,9 +745,11 @@ def _get_name(item):
 
 
 def load_items(
-    reader: guidata.dataset.io.HDF5Reader
-    | guidata.dataset.io.INIReader
-    | guidata.dataset.io.JSONReader,
+    reader: (
+        guidata.dataset.io.HDF5Reader
+        | guidata.dataset.io.INIReader
+        | guidata.dataset.io.JSONReader
+    ),
 ) -> list[Any]:
     """Load items from HDF5, INI or JSON file
 

plotpy/items/image/base.py

@@ -1264,7 +1264,6 @@ def deserialize(
         lut_range = reader.read(group_name="lut_range")
         if reader.read(group_name="load_from_fname"):
             name = reader.read(group_name="fname", func=reader.read_unicode)
-            name = io.iohandler.adapt_path(name)
             self.set_filename(name)
             self.load_data()
         else: