From 8542acc32cbe559f49c097cf50389df21b850fbd Mon Sep 17 00:00:00 2001 From: Ivan Shcheklein Date: Sun, 20 Oct 2024 18:25:34 -0700 Subject: [PATCH] fix mypy complaintes --- dvc/parsing/context.py | 5 +++-- dvc/utils/serialize/_common.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dvc/parsing/context.py b/dvc/parsing/context.py index 3d7beeec6d..af8d1b3fda 100644 --- a/dvc/parsing/context.py +++ b/dvc/parsing/context.py @@ -176,8 +176,9 @@ def _convert_with_meta(value, meta: Optional[Meta] = None): return value if isinstance(value, (list, dict)): assert meta - container = CtxDict if isinstance(value, dict) else CtxList - return container(value, meta=meta) + if isinstance(value, dict): + return CtxDict(value, meta=meta) + return CtxList(value, meta=meta) msg = f"Unsupported value of type '{type(value).__name__}' in '{meta}'" raise TypeError(msg) diff --git a/dvc/utils/serialize/_common.py b/dvc/utils/serialize/_common.py index fde893343e..e9eafd513d 100644 --- a/dvc/utils/serialize/_common.py +++ b/dvc/utils/serialize/_common.py @@ -61,7 +61,7 @@ def _load_data( ): open_fn = fs.open if fs else open encoding = "utf-8" - with open_fn(path, encoding=encoding, **kwargs) as fd: # type: ignore[operator] + with open_fn(path, encoding=encoding, **kwargs) as fd: # type: ignore[arg-type] with reraise(UnicodeDecodeError, EncodingError(path, encoding)): return parser(fd.read(), path) @@ -74,7 +74,7 @@ def _dump_data( **dumper_args, ): open_fn = fs.open if fs else open - with open_fn(path, "w+", encoding="utf-8") as fd: # type: ignore[operator] + with open_fn(path, "w+", encoding="utf-8") as fd: # type: ignore[call-overload] dumper(data, fd, **dumper_args)