From fb646783f5ed5c3fb180676d0970238b52297e02 Mon Sep 17 00:00:00 2001 From: Jonathan Neuhauser Date: Wed, 2 Mar 2022 23:12:51 +0100 Subject: [PATCH] Always use realpath for tempdir, fix #287 (again) --- inkex/base.py | 2 +- inkex/tester/__init__.py | 2 +- inkex/tester/mock.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inkex/base.py b/inkex/base.py index e42e5ae1..341e516b 100644 --- a/inkex/base.py +++ b/inkex/base.py @@ -425,7 +425,7 @@ class TempDirMixin(_Base): # pylint: disable=abstract-method self._tempdir = TemporaryDirectory( # pylint: disable=consider-using-with prefix=self.dir_prefix, suffix=self.dir_suffix ) - self.tempdir = self._tempdir.name + self.tempdir = os.path.realpath(self._tempdir.name) super().load_raw() def clean_up(self): diff --git a/inkex/tester/__init__.py b/inkex/tester/__init__.py index 5d40567f..f7e1d4b7 100644 --- a/inkex/tester/__init__.py +++ b/inkex/tester/__init__.py @@ -114,7 +114,7 @@ class TestCase(MockCommandMixin, BaseCase): def tempdir(self): """Generate a temporary location to store files""" if self._temp_dir is None: - self._temp_dir = tempfile.mkdtemp(prefix="inkex-tests-") + self._temp_dir = os.path.realpath(tempfile.mkdtemp(prefix="inkex-tests-")) if not os.path.isdir(self._temp_dir): raise IOError("The temporary directory has disappeared!") return self._temp_dir diff --git a/inkex/tester/mock.py b/inkex/tester/mock.py index 0f422e02..3b75dcd5 100644 --- a/inkex/tester/mock.py +++ b/inkex/tester/mock.py @@ -185,7 +185,7 @@ class MockCommandMixin(MockMixin): def record_tempdir(self, *args, **kwargs): """Record any attempts to make tempdirs""" newdir = self.old_call("mkdtemp")(*args, **kwargs) - self.recorded_tempdirs.append(newdir) + self.recorded_tempdirs.append(os.path.realpath(newdir)) return newdir def clean_paths(self, data, files): -- GitLab