From 80d665e8decd644d737930d450f0bc66d6b5b02c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 25 Jun 2017 20:24:14 +0300 Subject: Converted some modules. --- mesonbuild/modules/i18n.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mesonbuild/modules/i18n.py') diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index c4e29cf..3cea189 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -20,6 +20,7 @@ from .. import coredata, mesonlib, build from ..mesonlib import MesonException from . import ModuleReturnValue from . import ExtensionModule +from . import permittedKwargs PRESET_ARGS = { 'glib': [ @@ -55,6 +56,8 @@ class I18nModule(ExtensionModule): src_dir = path.join(state.environment.get_source_dir(), state.subdir) return [path.join(src_dir, d) for d in dirs] + @permittedKwargs(set(['languages', 'data_dirs', 'preset', 'args', 'po_dir', 'type', + 'input', 'output', 'install', 'install_dir'])) def merge_file(self, state, args, kwargs): podir = kwargs.pop('po_dir', None) if not podir: @@ -78,6 +81,7 @@ class I18nModule(ExtensionModule): ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, kwargs) return ModuleReturnValue(ct, [ct]) + @permittedKwargs(set(['po_dir', 'data_dirs', 'type', 'languages'])) def gettext(self, state, args, kwargs): if len(args) != 1: raise coredata.MesonException('Gettext requires one positional argument (package name).') -- cgit v1.1 From 3262be23dc3f01923a1d162a5914ba29f05416b7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 26 Jun 2017 20:39:00 +0300 Subject: Fixed issues raised in review. --- mesonbuild/modules/i18n.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/modules/i18n.py') diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 3cea189..d35c7f1 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -56,8 +56,8 @@ class I18nModule(ExtensionModule): src_dir = path.join(state.environment.get_source_dir(), state.subdir) return [path.join(src_dir, d) for d in dirs] - @permittedKwargs(set(['languages', 'data_dirs', 'preset', 'args', 'po_dir', 'type', - 'input', 'output', 'install', 'install_dir'])) + @permittedKwargs({'languages', 'data_dirs', 'preset', 'args', 'po_dir', 'type', + 'input', 'output', 'install', 'install_dir'}) def merge_file(self, state, args, kwargs): podir = kwargs.pop('po_dir', None) if not podir: @@ -81,7 +81,7 @@ class I18nModule(ExtensionModule): ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, kwargs) return ModuleReturnValue(ct, [ct]) - @permittedKwargs(set(['po_dir', 'data_dirs', 'type', 'languages'])) + @permittedKwargs({'po_dir', 'data_dirs', 'type', 'languages'}) def gettext(self, state, args, kwargs): if len(args) != 1: raise coredata.MesonException('Gettext requires one positional argument (package name).') -- cgit v1.1