summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2022-12-02 16:16:49 -0600
committerTristan Partin <tristan@partin.io>2022-12-11 14:50:26 -0600
commitdfea023ced8b48b318826738f54328ea24ef63b3 (patch)
tree65ff143361025e18f7bfab1328e1deaaf7771b66
parent2e600ef7104d89e1bee602c1cc56822b7f226f43 (diff)
downloadmeson-dfea023ced8b48b318826738f54328ea24ef63b3.tar.gz
Fix package kwarg type
-rw-r--r--mesonbuild/modules/java.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/java.py b/mesonbuild/modules/java.py
index edc60d348..792d70b91 100644
--- a/mesonbuild/modules/java.py
+++ b/mesonbuild/modules/java.py
@@ -22,6 +22,7 @@ from mesonbuild.compilers import detect_compiler_for
from mesonbuild.interpreterbase.decorators import ContainerTypeInfo, FeatureDeprecated, FeatureNew, KwargInfo, typed_pos_args, typed_kwargs
from mesonbuild.mesonlib import version_compare, MachineChoice
from . import NewExtensionModule, ModuleReturnValue, ModuleInfo
+from ..interpreter.type_checking import NoneType
if T.TYPE_CHECKING:
from . import ModuleState
@@ -52,7 +53,7 @@ class JavaModule(NewExtensionModule):
@typed_kwargs(
'java.generate_native_headers',
KwargInfo('classes', ContainerTypeInfo(list, str), default=[], listify=True, required=True),
- KwargInfo('package', str, default=None))
+ KwargInfo('package', (str, NoneType), default=None))
def generate_native_headers(self, state: ModuleState, args: T.Tuple[T.List[mesonlib.FileOrString]],
kwargs: T.Dict[str, T.Optional[str]]) -> ModuleReturnValue:
return self.__native_headers(state, args, kwargs)
@@ -64,7 +65,7 @@ class JavaModule(NewExtensionModule):
@typed_kwargs(
'java.native_headers',
KwargInfo('classes', ContainerTypeInfo(list, str), default=[], listify=True, required=True),
- KwargInfo('package', str, default=None))
+ KwargInfo('package', (str, NoneType), default=None))
def native_headers(self, state: ModuleState, args: T.Tuple[T.List[mesonlib.FileOrString]],
kwargs: T.Dict[str, T.Optional[str]]) -> ModuleReturnValue:
return self.__native_headers(state, args, kwargs)