Add some cheap return and parameter annotations

Use: https://github.com/JelleZijlstra/autotyping
to add "safe" return annotations.

Where a parameter has a default value that is an obvious scalar type
(bool, int, str, etc.) add those annotations as well.

Also fixed two small bugs that popped up when sanity-checking with
mypy.  One in FortranCommon, where a return had been previously
annotated to be a tuple of Action, which should be ActionBase -
Action is the factory function, not the base class. The other was
a typo in the error raised in _add_cppdefines - the message was
formatted with the value of "define" which should have been "defines".

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/SCons/Tool/xgettext.py b/SCons/Tool/xgettext.py
index ed76e2552..f04c6a6a1 100644
--- a/SCons/Tool/xgettext.py
+++ b/SCons/Tool/xgettext.py
@@ -51,7 +51,7 @@ class _CmdRunner:
     variables. It also provides `strfunction()` method, which shall be used by
     scons Action objects to print command string. """
 
-    def __init__(self, command, commandstr=None):
+    def __init__(self, command, commandstr=None) -> None:
         self.out = None
         self.err = None
         self.status = None
@@ -169,7 +169,7 @@ class _POTBuilder(BuilderBase):
         return BuilderBase._execute(self, env, target, source, *args)
 
 
-def _scan_xgettext_from_files(target, source, env, files=None, path=None):
+def _scan_xgettext_from_files(target, source, env, files=None, path=None) -> int:
     """ Parses `POTFILES.in`-like file and returns list of extracted file names.
     """
     if files is None:
@@ -257,7 +257,7 @@ def _POTUpdateBuilder(env, **kw):
     return _POTBuilder(**kw)
 
 
-def generate(env, **kw):
+def generate(env, **kw) -> None:
     """ Generate `xgettext` tool """
 
     if sys.platform == 'win32':