typing: small improvements

This commit is contained in:
James R. Barlow
2021-12-06 15:38:27 -08:00
parent 8f873aaa45
commit 26badf2882
2 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ import importlib.util
import pkgutil
import sys
from pathlib import Path
from typing import List, Tuple, Union
from typing import List, Sequence, Tuple, Union
import pluggy
@@ -110,7 +110,7 @@ def get_plugin_manager(plugins: List[Union[str, Path]], builtins=True):
def get_parser_options_plugins(
args,
args: Sequence[str],
) -> Tuple[argparse.ArgumentParser, argparse.Namespace, pluggy.PluginManager]:
pre_options, _unused = plugins_only_parser.parse_known_args(args=args)
plugin_manager = get_plugin_manager(pre_options.plugins)
+4 -3
View File
@@ -14,7 +14,7 @@ import threading
from functools import partial
from pathlib import Path
from tempfile import mkdtemp
from typing import List, NamedTuple, Optional, Tuple
from typing import List, NamedTuple, Optional, Tuple, cast
import PIL
@@ -327,7 +327,7 @@ def configure_debug_logging(
def run_pipeline(
options: argparse.Namespace,
*,
plugin_manager: OcrmypdfPluginManager,
plugin_manager: Optional[OcrmypdfPluginManager],
api: bool = False,
) -> ExitCode:
# Any changes to options will not take effect for options that are already
@@ -388,7 +388,7 @@ def run_pipeline(
hasattr(options.output_file, 'writable') and options.output_file.writable()
):
log.info("Output written to stream")
elif samefile(options.output_file, os.devnull):
elif samefile(options.output_file, Path(os.devnull)):
pass # Say nothing when sending to dev null
else:
if options.output_type.startswith('pdfa'):
@@ -415,6 +415,7 @@ def run_pipeline(
log.error("KeyboardInterrupt")
return ExitCode.ctrl_c
except (ExitCodeException if not api else NeverRaise) as e:
e = cast(ExitCodeException, e)
if options.verbose >= 1:
log.exception("ExitCodeException")
elif str(e):