dcicutils 8.8.4.1b22__tar.gz → 8.8.4.1b24__tar.gz

{dcicutils-8.8.4.1b22 → dcicutils-8.8.4.1b24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.4.1b22
+Version: 8.8.4.1b24
 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.1b22 → dcicutils-8.8.4.1b24}/dcicutils/file_utils.py

@@ -79,15 +79,15 @@ def search_for_file(file: str,
     return None if single is True else []
 
 
-def normalize_path(value: Union[str, pathlib.Path], absolute: bool = False, home: Optional[bool] = None) -> str:
+def normalize_path(value: Union[str, pathlib.Path], absolute: bool = False, expand_home: Optional[bool] = None) -> str:
     """
     Normalizes the given path value and returns the result; does things like remove redundant
     consecutive directory separators and redundant parent paths. If the given absolute argument
-    is True than converts the path to an absolute path. If the given home argument is True and
-    if the path can reasonably be represented with a home directory indicator (i.e. "~"), then
-    converts it to such. If the home argument is False and path starts with the home directory
-    indicator then expands it to the actual (absolute) home path. If the given value is not
-    actually even a string (or pathlib.Path) then returns an empty string.
+    is True than converts the path to an absolute path. If the given expand_home argument is False
+    and if the path can reasonably be represented with a home directory indicator (i.e. "~"), then
+    converts it to such. If the expand_home argument is True and path starts with the home directory
+    indicator (i.e. "~") then expands it to the actual (absolute) home path of the caller. If the
+    given path value is not actually even a string (or pathlib.Path) then returns an empty string.
     """
     if isinstance(value, pathlib.Path):
         value = str(value)
@@ -95,9 +95,9 @@ def normalize_path(value: Union[str, pathlib.Path], absolute: bool = False, home
         return ""
     if not (value := value.strip()) or not (value := os.path.normpath(value)):
         return ""
-    if home is False:
+    if expand_home is True:
         value = os.path.expanduser(value)
-    elif (home is True) and (os.name == "posix") and value.startswith(home := HOME_DIRECTORY + os.sep):
+    elif (expand_home is False) and (os.name == "posix") and value.startswith(home := HOME_DIRECTORY + os.sep):
         value = "~/" + value[len(home):]
     if absolute is True:
         value = os.path.abspath(value)

{dcicutils-8.8.4.1b22 → dcicutils-8.8.4.1b24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.4.1b22"  # TODO: To become 8.8.5
+version = "8.8.4.1b24"  # 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"