type fixes and simplifications

Author: mr-c

cwl_utils/graph_split.py

@@ -18,10 +18,8 @@
 from pathlib import Path
 from typing import (
     IO,
-    TYPE_CHECKING,
     Any,
     MutableMapping,
-    Optional,
     Set,
     TextIO,
     Union,
@@ -35,9 +33,6 @@
 
 from cwl_utils.loghandler import _logger as _cwlutilslogger
 
-if TYPE_CHECKING:
-    from _typeshed import StrPath
-
 _logger = logging.getLogger("cwl-graph-split")  # pylint: disable=invalid-name
 defaultStreamHandler = logging.StreamHandler()  # pylint: disable=invalid-name
 _logger.addHandler(defaultStreamHandler)
@@ -93,7 +88,7 @@ def run(args: list[str]) -> int:
     with open(options.cwlfile) as source_handle:
         graph_split(
             source_handle,
-            options.outdir,
+            Path(options.outdir),
             options.output_format,
             options.mainfile,
             options.pretty,
@@ -103,7 +98,7 @@ def run(args: list[str]) -> int:
 
 def graph_split(
     sourceIO: IO[str],
-    output_dir: "StrPath",
+    output_dir: Path,
     output_format: str,
     mainfile: str,
     pretty: bool,
@@ -121,11 +116,11 @@ def graph_split(
     version = source.pop("cwlVersion")
 
     # Check outdir parent exists
-    if not Path(output_dir).parent.is_dir():
+    if not output_dir.parent.is_dir():
         raise NotADirectoryError(f"Parent directory of {output_dir} does not exist")
     # If output_dir is not a directory, create it
-    if not Path(output_dir).is_dir():
-        os.mkdir(output_dir)
+    if not output_dir.is_dir():
+        output_dir.mkdir()
 
     def my_represent_none(
         self: Any, data: Any
@@ -138,7 +133,7 @@ def my_represent_none(
     for entry in source["$graph"]:
         entry_id = entry.pop("id").lstrip("#")
         entry["cwlVersion"] = version
-        imports = rewrite(entry, entry_id, Path(output_dir))
+        imports = rewrite(entry, entry_id, output_dir)
         if imports:
             for import_name in imports:
                 rewrite_types(entry, f"#{import_name}", False)
@@ -148,15 +143,15 @@ def my_represent_none(
             else:
                 entry_id = mainfile
 
-        output_file = Path(output_dir) / (re.sub(".cwl$", "", entry_id) + ".cwl")
+        output_file = output_dir / (re.sub(".cwl$", "", entry_id) + ".cwl")
         if output_format == "json":
             json_dump(entry, output_file)
         elif output_format == "yaml":
             yaml_dump(entry, output_file, pretty)
 
 
 def rewrite(
-    document: Any, doc_id: str, output_dir: Path, pretty: Optional[bool] = False
+    document: Any, doc_id: str, output_dir: Path, pretty: bool = False
 ) -> Set[str]:
     """Rewrite the given element from the CWL $graph."""
     imports = set()
@@ -245,7 +240,7 @@ def rewrite_types(field: Any, entry_file: str, sameself: bool) -> None:
 
 
 def rewrite_schemadef(
-    document: MutableMapping[str, Any], output_dir: Path, pretty: Optional[bool] = False
+    document: MutableMapping[str, Any], output_dir: Path, pretty: bool = False
 ) -> Set[str]:
     """Dump the schemadefs to their own file."""
     for entry in document["types"]:
@@ -256,7 +251,7 @@ def rewrite_schemadef(
             for field in entry["fields"]:
                 field["name"] = field["name"].split("/")[2]
                 rewrite_types(field, entry_file, True)
-            with open(output_dir / entry_file, "a", encoding="utf-8") as entry_handle:
+            with (output_dir / entry_file).open("a", encoding="utf-8") as entry_handle:
                 yaml_dump(entry, entry_handle, pretty)
             entry["$import"] = entry_file
             del entry["name"]
@@ -278,15 +273,15 @@ def seen_import(entry: MutableMapping[str, Any]) -> bool:
     return seen_imports
 
 
-def json_dump(entry: Any, output_file: str) -> None:
+def json_dump(entry: Any, output_file: Path) -> None:
     """Output object as JSON."""
-    with open(output_file, "w", encoding="utf-8") as result_handle:
+    with output_file.open("w", encoding="utf-8") as result_handle:
         json.dump(entry, result_handle, indent=4)
 
 
 def yaml_dump(
     entry: Any,
-    output_file_or_handle: Optional[Union[str, Path, TextIOWrapper, TextIO]],
+    output_file_or_handle: Union[str, Path, TextIOWrapper, TextIO],
     pretty: bool,
 ) -> None:
     """Output object as YAML."""
@@ -299,13 +294,15 @@ def yaml_dump(
         with open(output_file_or_handle, "w", encoding="utf-8") as result_handle:
             if pretty:
                 result_handle.write(stringify_dict(entry))
-            else:
-                yaml.dump(entry, result_handle)
+                return
+            yaml.dump(entry, result_handle)
+            return
     elif isinstance(output_file_or_handle, (TextIOWrapper, TextIO)):
         if pretty:
             output_file_or_handle.write(stringify_dict(entry))
-        else:
-            yaml.dump(entry, output_file_or_handle)
+            return
+        yaml.dump(entry, output_file_or_handle)
+        return
     else:
         raise ValueError(
             f"output_file_or_handle must be a string or a file handle but got {type(output_file_or_handle)}"