From e3c8257fc96b45be725cc1a729397a3a9f7f2605 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Fri, 8 Oct 2021 13:55:41 -0700
Subject: [PATCH] modules/windows: add some easy type annotations

This isn't complete, it's just the easy stuff
---
 mesonbuild/modules/windows.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index 8f1af2cdd..931d908b8 100644
--- a/mesonbuild/modules/windows.py
+++ b/mesonbuild/modules/windows.py
@@ -15,40 +15,47 @@
 import enum
 import os
 import re
+import typing as T
 
-from .. import mlog
-from .. import mesonlib, build
-from ..mesonlib import MachineChoice, MesonException, extract_as_list
-from . import ModuleReturnValue
 from . import ExtensionModule
+from . import ModuleReturnValue
+from .. import mesonlib, build
+from .. import mlog
 from ..interpreterbase import permittedKwargs, FeatureNewKwargs, flatten
+from ..mesonlib import MachineChoice, MesonException, extract_as_list
 from ..programs import ExternalProgram
 
+if T.TYPE_CHECKING:
+    from . import ModuleState
+    from ..compilers import Compiler
+    from ..interpreter import Interpreter
+
 class ResourceCompilerType(enum.Enum):
     windres = 1
     rc = 2
     wrc = 3
 
 class WindowsModule(ExtensionModule):
-    def __init__(self, interpreter):
+    def __init__(self, interpreter: 'Interpreter'):
         super().__init__(interpreter)
+        self._rescomp: T.Optional[T.Tuple[ExternalProgram, ResourceCompilerType]] = None
         self.methods.update({
             'compile_resources': self.compile_resources,
         })
 
-    def detect_compiler(self, compilers):
+    def detect_compiler(self, compilers: T.Dict[str, 'Compiler']) -> 'Compiler':
         for l in ('c', 'cpp'):
             if l in compilers:
                 return compilers[l]
         raise MesonException('Resource compilation requires a C or C++ compiler.')
 
-    def _find_resource_compiler(self, state):
+    def _find_resource_compiler(self, state: 'ModuleState') -> T.Tuple[ExternalProgram, ResourceCompilerType]:
         # FIXME: Does not handle `native: true` executables, see
         # See https://github.com/mesonbuild/meson/issues/1531
         # Take a parameter instead of the hardcoded definition below
         for_machine = MachineChoice.HOST
 
-        if hasattr(self, '_rescomp'):
+        if self._rescomp:
             return self._rescomp
 
         # Will try cross / native file and then env var
@@ -82,7 +89,7 @@ class WindowsModule(ExtensionModule):
 
     @FeatureNewKwargs('windows.compile_resources', '0.47.0', ['depend_files', 'depends'])
     @permittedKwargs({'args', 'include_directories', 'depend_files', 'depends'})
-    def compile_resources(self, state, args, kwargs):
+    def compile_resources(self, state: 'ModuleState', args, kwargs):
         extra_args = mesonlib.stringlistify(flatten(kwargs.get('args', [])))
         wrc_depend_files = extract_as_list(kwargs, 'depend_files', pop = True)
         wrc_depends = extract_as_list(kwargs, 'depends', pop = True)
@@ -167,5 +174,5 @@ class WindowsModule(ExtensionModule):
 
         return ModuleReturnValue(res_targets, [res_targets])
 
-def initialize(*args, **kwargs):
-    return WindowsModule(*args, **kwargs)
+def initialize(interp: 'Interpreter') -> WindowsModule:
+    return WindowsModule(interp)