cleanup

Author: FabriceSalvaire

PySpice/Spice/StringTools.py

@@ -28,25 +28,32 @@
 
 ####################################################################################################
 
+from typing import Any, Iterable
 import os
 
 from .unit import str_spice
 
 ####################################################################################################
 
-def prefix_lines(items, prefix=''):
-    return [prefix + str(item)
-            for item in items
-            if item is not None]   # Fixme: and item
+NEWLINE = os.linesep
 
 ####################################################################################################
 
-def join_lines(items, prefix=''):
-    return os.linesep.join(prefix_lines(items, prefix))
+def prefix_lines(items: Iterable[Any], prefix: str = '') -> list[str]:
+    return [
+        prefix + str(item)
+        for item in items
+        if item is not None
+    ]   # Fixme: and item
 
 ####################################################################################################
 
-def join_list(items):
+def join_lines(items: Iterable[Any], prefix: str = '') -> str:
+    return NEWLINE.join(prefix_lines(items, prefix))
+
+####################################################################################################
+
+def join_list(items: Iterable[Any]) -> str:
     # return ' '.join([str_spice(item)
     #                  for item in items
     #                  if item is not None and str_spice(item)])
@@ -68,11 +75,13 @@ def join_list(items):
 #
 ####################################################################################################
 
-def join_dict(d):
+def join_dict(d: dict[str, Any]) -> str:
     # Fixme: remove trailing _ to key ???
-    return ' '.join([f'{key}={str_spice(value)}'
-                     for key, value in sorted(d.items())
-                     if value is not None])
+    return ' '.join([
+        f'{key}={str_spice(value)}'
+        for key, value in sorted(d.items())
+        if value is not None
+    ])
 
 ####################################################################################################
 

PySpice/Tools/PathTools.py

@@ -29,19 +29,26 @@
 
 ####################################################################################################
 
-def find(file_name, directories):
+def find(file_name: str, directories: list[str]) -> Path:
     # Fixme: bytes ???
-    if isinstance(directories, bytes):
-        directories = (directories,)
+    #  on Linux path are bytes, thus some files can be invalid utf8...
+    # if isinstance(directories, bytes):
+    #     directories = (directories,)
     for directory in directories:
-        for directory_path, _, file_names in os.walk(directory):
+        directory = Path(directory)
+        # for directory_path, _, file_names in os.walk(directory):
+        for directory_path, _, file_names in directory.walk():
+            directory_path = Path(directory_path)
             if file_name in file_names:
-                return os.path.join(directory_path, file_name)
-    raise NameError("File %s not found in directories %s" % (file_name, str(directories)))
+                return directory_path.joinpath(file_name)
+    raise NameError(f"File {file_name} not found in directories {directories}")
 
 ####################################################################################################
 
-def expand_path(path) -> Path:
+def expand_path(path: Path | str) -> Path:
+    # Substrings of the form $name or ${name} are replaced by the value of environment variable name.
+    # On Unix and Windows, return the argument with an initial component of ~ or ~user
+    # replaced by that user’s home directory.
     _ = os.path.expandvars(path)
     return Path(_).expanduser().absolute()