diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-12 17:33:15 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-18 23:48:33 +0200 |
commit | d601227cb2e00e8d4279f8dae27184fdbb0895e2 (patch) | |
tree | 3f27900f6bcac71fe6eb7d265c0d9eaf958c6ee7 /mesonbuild/interpreterbase/interpreterbase.py | |
parent | 7be172fe16c1b1c89bf66eff506e6bb007decce3 (diff) | |
download | meson-d601227cb2e00e8d4279f8dae27184fdbb0895e2.zip meson-d601227cb2e00e8d4279f8dae27184fdbb0895e2.tar.gz meson-d601227cb2e00e8d4279f8dae27184fdbb0895e2.tar.bz2 |
interpreter: Add FileHolder and remove specical case for File
Diffstat (limited to 'mesonbuild/interpreterbase/interpreterbase.py')
-rw-r--r-- | mesonbuild/interpreterbase/interpreterbase.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py index 05ea11f..be90049 100644 --- a/mesonbuild/interpreterbase/interpreterbase.py +++ b/mesonbuild/interpreterbase/interpreterbase.py @@ -545,8 +545,6 @@ The result of this is undefined and will become a hard error in a future Meson r return self.array_method_call(obj, method_name, args, kwargs) if isinstance(obj, dict): return self.dict_method_call(obj, method_name, args, kwargs) - if isinstance(obj, mesonlib.File): - raise InvalidArguments('File object "%s" is not callable.' % obj) if not isinstance(obj, InterpreterObject): raise InvalidArguments('Variable "%s" is not callable.' % object_name) # Special case. This is the only thing you can do with a disabler @@ -867,7 +865,7 @@ To specify a keyword argument, use : instead of =.''') def is_assignable(self, value: T.Any) -> bool: return isinstance(value, (InterpreterObject, dependencies.Dependency, - str, int, list, dict, mesonlib.File)) + str, int, list, dict)) def validate_extraction(self, buildtarget: InterpreterObject) -> None: raise InterpreterException('validate_extraction is not implemented in this context (please file a bug)') |