dcicutils 8.8.4.1b31__tar.gz → 8.8.4.1b33__tar.gz

{dcicutils-8.8.4.1b31 → dcicutils-8.8.4.1b33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.4.1b31
+Version: 8.8.4.1b33
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.8.4.1b31 → dcicutils-8.8.4.1b33}/dcicutils/file_utils.py

@@ -14,7 +14,7 @@ HOME_DIRECTORY = str(pathlib.Path().home())
 
 
 def search_for_file(file: str,
-                    location: Union[str, Optional[List[str]]] = None,
+                    location: Union[str, pathlib.PosixPath, Optional[List[Union[str, pathlib.PosixPath]]]] = None,
                     recursive: bool = False,
                     single: bool = False,
                     order: bool = True) -> Union[List[str], Optional[str]]:
@@ -35,7 +35,7 @@ def search_for_file(file: str,
         return None if single is True else []
     if os.path.isabs(file):
         if os.path.exists(file):
-            return file if single is True else [file]
+            return str(file) if single is True else [str(file)]
         return None if single is True else []
     files_found = []
     if not location:
@@ -53,7 +53,7 @@ def search_for_file(file: str,
         if not (directory := directory.strip()):
             continue
         if os.path.isfile(directory := os.path.abspath(os.path.normpath(directory))):
-            # Allow a file; assume its parent directory was intended.
+            # Actually, allow a file rather then a directory; assume its parent directory was intended.
             if not (directory := os.path.dirname(directory)):
                 continue
         if directory not in location_pruned:

{dcicutils-8.8.4.1b31 → dcicutils-8.8.4.1b33}/dcicutils/tmpfile_utils.py

@@ -50,12 +50,6 @@ def remove_temporary_directory(tmp_directory_name: str) -> None:
     """
     Removes the given directory, recursively; but ONLY if it is (somewhere) within the system temporary directory.
     """
-    def is_temporary_directory(path: str) -> bool:
-        try:
-            tmpdir = tempfile.gettempdir()
-            return os.path.commonpath([path, tmpdir]) == tmpdir and os.path.exists(path) and os.path.isdir(path)
-        except Exception:
-            return False
     if is_temporary_directory(tmp_directory_name):  # Guard against errant deletion.
         shutil.rmtree(tmp_directory_name)
 
@@ -72,3 +66,11 @@ def remove_temporary_file(tmp_file_name: str) -> bool:
         return False
     except Exception:
         return False
+
+
+def is_temporary_directory(path: str) -> bool:
+    try:
+        tmpdir = tempfile.gettempdir()
+        return os.path.commonpath([path, tmpdir]) == tmpdir and os.path.exists(path) and os.path.isdir(path)
+    except Exception:
+        return False

{dcicutils-8.8.4.1b31 → dcicutils-8.8.4.1b33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.4.1b31"  # TODO: To become 8.8.5
+version = "8.8.4.1b33"  # TODO: To become 8.8.5
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"