diff options
Diffstat (limited to 'mesonbuild/interpreterbase/_unholder.py')
| -rw-r--r-- | mesonbuild/interpreterbase/_unholder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreterbase/_unholder.py b/mesonbuild/interpreterbase/_unholder.py index 10c7cfc8f..55f342364 100644 --- a/mesonbuild/interpreterbase/_unholder.py +++ b/mesonbuild/interpreterbase/_unholder.py @@ -12,21 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -from .baseobjects import InterpreterObject, MesonInterpreterObject, ObjectHolder, TYPE_var +from .baseobjects import InterpreterObject, MesonInterpreterObject, ObjectHolder, TYPE_var, HoldableTypes from .exceptions import InvalidArguments from ..mesonlib import HoldableObject, MesonBugException import typing as T def _unholder(obj: T.Union[TYPE_var, InterpreterObject], *, permissive: bool = False) -> TYPE_var: - if isinstance(obj, (int, bool, str)): + if isinstance(obj, (bool, str)): return obj elif isinstance(obj, list): return [_unholder(x, permissive=permissive) for x in obj] elif isinstance(obj, dict): return {k: _unholder(v, permissive=permissive) for k, v in obj.items()} elif isinstance(obj, ObjectHolder): - assert isinstance(obj.held_object, HoldableObject) + assert isinstance(obj.held_object, HoldableTypes) return obj.held_object elif isinstance(obj, MesonInterpreterObject): return obj |
