From 8495075ceeb7c2d12589a9226d74e19f5cfc7e9b Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Tue, 3 Nov 2015 03:31:56 +0200 Subject: Turned builtin options into proper objects. --- optinterpreter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'optinterpreter.py') diff --git a/optinterpreter.py b/optinterpreter.py index d66aa1f32..f10632630 100644 --- a/optinterpreter.py +++ b/optinterpreter.py @@ -40,11 +40,11 @@ class OptionException(coredata.MesonException): optname_regex = re.compile('[^a-zA-Z0-9_-]') def StringParser(name, description, kwargs): - return mesonlib.UserStringOption(name, description, + return coredata.UserStringOption(name, description, kwargs.get('value', '')) def BooleanParser(name, description, kwargs): - return mesonlib.UserBooleanOption(name, description, kwargs.get('value', True)) + return coredata.UserBooleanOption(name, description, kwargs.get('value', True)) def ComboParser(name, description, kwargs): if 'choices' not in kwargs: @@ -55,7 +55,7 @@ def ComboParser(name, description, kwargs): for i in choices: if not isinstance(i, str): raise OptionException('Combo choice elements must be strings.') - return mesonlib.UserComboOption(name, description, choices, kwargs.get('value', choices[0])) + return coredata.UserComboOption(name, description, choices, kwargs.get('value', choices[0])) option_types = {'string' : StringParser, 'boolean' : BooleanParser, -- cgit v1.2.3