diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-06-02 09:33:17 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-15 12:48:53 -0700 |
commit | ec48dbd2d6f265529043f1db680b15dac14b7361 (patch) | |
tree | dd6a8315076deb032e9919864e561a159f193afc /mesonbuild/interpreter/interpreterobjects.py | |
parent | a65429d57bf8e71eea0547ee3c8f1d2c7b815d85 (diff) | |
download | meson-ec48dbd2d6f265529043f1db680b15dac14b7361.zip meson-ec48dbd2d6f265529043f1db680b15dac14b7361.tar.gz meson-ec48dbd2d6f265529043f1db680b15dac14b7361.tar.bz2 |
interpreterobjects: Clean up GeneratedListHolder
Remove an unused method (that didn't work before this series), and
remove the ability to pass a Generator to the GeneratedListHolder, it's
never used and it's weird and not the way Meson generally works now.
While we're here, finish the type annotations.
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
-rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index 42d983f..7b59a24 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -625,19 +625,14 @@ class ExternalLibraryHolder(InterpreterObject, ObjectHolder[ExternalLibrary]): class GeneratedListHolder(InterpreterObject, ObjectHolder[build.GeneratedList]): - def __init__(self, arg1, extra_args=None): + def __init__(self, arg1: 'build.GeneratedList'): InterpreterObject.__init__(self) - if isinstance(arg1, GeneratorHolder): - ObjectHolder.__init__(self, build.GeneratedList(arg1.held_object, extra_args if extra_args is not None else [])) - else: - ObjectHolder.__init__(self, arg1) + ObjectHolder.__init__(self, arg1) - def __repr__(self): + def __repr__(self) -> str: r = '<{}: {!r}>' return r.format(self.__class__.__name__, self.held_object.get_outputs()) - def add_file(self, a): - self.held_object.add_file(a) # A machine that's statically known from the cross file class MachineHolder(InterpreterObject, ObjectHolder['MachineInfo']): |