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, 2 insertions, 2 deletions

diff --git a/SCons/ErrorsTests.py b/SCons/ErrorsTests.py
index 9f2f1a280..9743f0db3 100644
--- a/SCons/ErrorsTests.py
+++ b/SCons/ErrorsTests.py
@@ -95,7 +95,7 @@ class ErrorsTestCase(unittest.TestCase):
         except SCons.Errors.ExplicitExit as e:
             assert e.node == "node"
 
-    def test_convert_EnvironmentError_to_BuildError(self):
+    def test_convert_EnvironmentError_to_BuildError(self) -> None:
         """Test the convert_to_BuildError function on SConsEnvironmentError
         exceptions.
         """
@@ -106,7 +106,7 @@ class ErrorsTestCase(unittest.TestCase):
         assert be.exitstatus == 2
         assert be.filename is None
 
-    def test_convert_OSError_to_BuildError(self):
+    def test_convert_OSError_to_BuildError(self) -> None:
         """Test the convert_to_BuildError function on OSError
         exceptions.
         """