From 0c937a1209363f7a6d9f5600523f831873860ab3 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 9 Jul 2018 10:45:20 +0100
Subject: [PATCH] ENH: tempdir now has an override option
---
fsl/utils/tempdir.py | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/fsl/utils/tempdir.py b/fsl/utils/tempdir.py
index b819058f8..23bf4d774 100644
--- a/fsl/utils/tempdir.py
+++ b/fsl/utils/tempdir.py
@@ -21,7 +21,7 @@ import contextlib
@contextlib.contextmanager
-def tempdir(root=None, changeto=True):
+def tempdir(root=None, changeto=True, override=None):
"""Returns a context manager which creates and returns a temporary
directory, and then deletes it on exit.
@@ -32,17 +32,25 @@ def tempdir(root=None, changeto=True):
:arg changeto: If ``True`` (the default), current working directory is set
to the new temporary directory before yielding, and restored
afterwards.
+
+ :arg override: Don't create a temporary directory, but use this one
+ instead. This allows ``tempdir`` to be used as a context
+ manager when a temporary directory already exists.
"""
- testdir = tempfile.mkdtemp(dir=root)
- prevdir = os.getcwd()
- try:
+ if override is None:
+ testdir = tempfile.mkdtemp(dir=root)
+ prevdir = os.getcwd()
+ else:
+ testdir = override
+ try:
if changeto:
os.chdir(testdir)
yield testdir
finally:
- if changeto:
- os.chdir(prevdir)
- shutil.rmtree(testdir)
+ if override is None:
+ if changeto:
+ os.chdir(prevdir)
+ shutil.rmtree(testdir)
--
GitLab