| Message ID | 20210623190919.956814-1-dlatypov@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Shuah Khan |
| Headers | show |
| Series | kunit: tool: remove unnecessary "annotations" import | expand |
On Thu, Jun 24, 2021 at 3:09 AM Daniel Latypov <dlatypov@google.com> wrote: > > The import was working around the fact "tuple[T]" was used instead of > typing.Tuple[T]. > > Convert it to use type.Tuple to be consistent with how the rest of the > code is anotated. > > Signed-off-by: Daniel Latypov <dlatypov@google.com> > --- This looks sensible and works for me. Reviewed-by: David Gow <davidgow@google.com> Thanks, -- David > tools/testing/kunit/kunit_kernel.py | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py > index e1951fa60027..5987d5b1b874 100644 > --- a/tools/testing/kunit/kunit_kernel.py > +++ b/tools/testing/kunit/kunit_kernel.py > @@ -6,15 +6,13 @@ > # Author: Felix Guo <felixguoxiuping@gmail.com> > # Author: Brendan Higgins <brendanhiggins@google.com> > > -from __future__ import annotations > import importlib.util > import logging > import subprocess > import os > import shutil > import signal > -from typing import Iterator > -from typing import Optional > +from typing import Iterator, Optional, Tuple > > from contextlib import ExitStack > > @@ -208,7 +206,7 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT > raise ConfigError(arch + ' is not a valid arch') > > def get_source_tree_ops_from_qemu_config(config_path: str, > - cross_compile: Optional[str]) -> tuple[ > + cross_compile: Optional[str]) -> Tuple[ > str, LinuxSourceTreeOperations]: > # The module name/path has very little to do with where the actual file > # exists (I learned this through experimentation and could not find it > > base-commit: 87c9c16317882dd6dbbc07e349bc3223e14f3244 > -- > 2.32.0.93.g670b81a890-goog >
On Wed, Jun 23, 2021 at 12:09 PM Daniel Latypov <dlatypov@google.com> wrote: > > The import was working around the fact "tuple[T]" was used instead of > typing.Tuple[T]. > > Convert it to use type.Tuple to be consistent with how the rest of the > code is anotated. nit: s/anotated/annotated > > Signed-off-by: Daniel Latypov <dlatypov@google.com> Reviewed-by: Brendan Higgins <brendanhiggins@google.com> Tested-by: Brendan Higgins <brendanhiggins@google.com>
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index e1951fa60027..5987d5b1b874 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -6,15 +6,13 @@ # Author: Felix Guo <felixguoxiuping@gmail.com> # Author: Brendan Higgins <brendanhiggins@google.com> -from __future__ import annotations import importlib.util import logging import subprocess import os import shutil import signal -from typing import Iterator -from typing import Optional +from typing import Iterator, Optional, Tuple from contextlib import ExitStack @@ -208,7 +206,7 @@ def get_source_tree_ops(arch: str, cross_compile: Optional[str]) -> LinuxSourceT raise ConfigError(arch + ' is not a valid arch') def get_source_tree_ops_from_qemu_config(config_path: str, - cross_compile: Optional[str]) -> tuple[ + cross_compile: Optional[str]) -> Tuple[ str, LinuxSourceTreeOperations]: # The module name/path has very little to do with where the actual file # exists (I learned this through experimentation and could not find it
The import was working around the fact "tuple[T]" was used instead of typing.Tuple[T]. Convert it to use type.Tuple to be consistent with how the rest of the code is anotated. Signed-off-by: Daniel Latypov <dlatypov@google.com> --- tools/testing/kunit/kunit_kernel.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) base-commit: 87c9c16317882dd6dbbc07e349bc3223e14f3244