-

cool-RR · cool-RR · commit ec965afeb93c · 2015-12-13T22:38:57.000+02:00
diff --git a/source_py3/python_toolbox/temp_file_tools.py b/source_py3/python_toolbox/temp_file_tools.py
@@ -15,7 +15,7 @@
 
 
 @context_management.ContextManagerType
-def create_temp_folder(suffix='', prefix=tempfile.template):
+def create_temp_folder(*, prefix=tempfile.template, suffix='', dir=None):
     '''
     Context manager that creates a temporary folder and deletes it after usage.
     
@@ -35,9 +35,12 @@ def create_temp_folder(suffix='', prefix=tempfile.template):
         # The suite is finished, now it's all cleaned:
         assert not temp_folder.exists()
        
-    Use the `suffix` and `prefix` string arguments to dictate a suffix and/or a
-    prefix to the temporary folder's name in the filesystem.        
+    Use the `prefix` and `suffix` string arguments to dictate a prefix and/or a
+    suffix to the temporary folder's name in the filesystem.
     '''
-    temp_folder = pathlib.Path(tempfile.mkdtemp(suffix=suffix, prefix=prefix))
-    yield temp_folder
-    shutil.rmtree(str(temp_folder))
+    temp_folder = pathlib.Path(tempfile.mkdtemp(prefix=prefix, suffix=suffix, 
+                                                dir=dir))
+    try:
+        yield temp_folder
+    finally:
+        shutil.rmtree(str(temp_folder))
diff --git a/source_py3/test_python_toolbox/test_temp_file_tools/test_create_temp_folder.py b/source_py3/test_python_toolbox/test_temp_file_tools/test_create_temp_folder.py
@@ -85,4 +85,14 @@ def test_without_pathlib():
     assert not os.path.isdir(file_path)
     
 
+def test_prefix_suffix():
+    with create_temp_folder(prefix='hocus', suffix='pocus') as tf1:
+        assert tf1.name.startswith('hocus')
+        assert tf1.name.endswith('pocus')
 
+def test_dir():
+    with create_temp_folder() as tf1:
+        with create_temp_folder(dir=str(tf1)) as tf2:
+            assert isinstance(tf2, pathlib.Path)
+            assert str(tf2).startswith(str(tf1))
+    
