diff --git a/arraycontext/container/traversal.py b/arraycontext/container/traversal.py index 62f6354c54f88c654f1cdb90058e2ce03c4d33da..8abd73d95a5ae2051c12bf15099d51687a04513c 100644 --- a/arraycontext/container/traversal.py +++ b/arraycontext/container/traversal.py @@ -110,16 +110,16 @@ def _map_array_container_impl( specific container classes. By default, the recursion is stopped when a non-:class:`ArrayContainer` class is encountered. """ - def rec(_ary: ArrayOrContainer) -> ArrayOrContainer: - if type(_ary) is leaf_cls: # type(ary) is never None - return f(_ary) + def rec(ary_: ArrayOrContainer) -> ArrayOrContainer: + if type(ary_) is leaf_cls: # type(ary) is never None + return f(ary_) try: - iterable = serialize_container(_ary) + iterable = serialize_container(ary_) except NotAnArrayContainerError: - return f(_ary) + return f(ary_) else: - return deserialize_container(_ary, [ + return deserialize_container(ary_, [ (key, frec(subary)) for key, subary in iterable ]) @@ -144,28 +144,28 @@ def _multimap_array_container_impl( # {{{ recursive traversal - def rec(*_args: Any) -> Any: - template_ary = _args[container_indices[0]] + def rec(*args_: Any) -> Any: + template_ary = args_[container_indices[0]] if type(template_ary) is leaf_cls: - return f(*_args) + return f(*args_) try: iterable_template = serialize_container(template_ary) except NotAnArrayContainerError: - return f(*_args) + return f(*args_) else: pass assert all( - type(_args[i]) is type(template_ary) for i in container_indices[1:] + type(args_[i]) is type(template_ary) for i in container_indices[1:] ), f"expected type '{type(template_ary).__name__}'" result = [] - new_args = list(_args) + new_args = list(args_) for subarys in zip( iterable_template, - *[serialize_container(_args[i]) for i in container_indices[1:]], + *[serialize_container(args_[i]) for i in container_indices[1:]], strict=True ): key = None @@ -415,13 +415,13 @@ def rec_keyed_map_array_container( """ def rec(keys: tuple[SerializationKey, ...], - _ary: ArrayOrContainerT) -> ArrayOrContainerT: + ary_: ArrayOrContainerT) -> ArrayOrContainerT: try: - iterable = serialize_container(_ary) + iterable = serialize_container(ary_) except NotAnArrayContainerError: - return cast(ArrayOrContainerT, f(keys, cast(ArrayT, _ary))) + return cast(ArrayOrContainerT, f(keys, cast(ArrayT, ary_))) else: - return deserialize_container(_ary, [ + return deserialize_container(ary_, [ (key, rec((*keys, key), subary)) for key, subary in iterable ]) @@ -522,14 +522,14 @@ def rec_map_reduce_array_container( or any other such traversal. """ - def rec(_ary: ArrayOrContainerT) -> ArrayOrContainerT: - if type(_ary) is leaf_class: - return map_func(_ary) + def rec(ary_: ArrayOrContainerT) -> ArrayOrContainerT: + if type(ary_) is leaf_class: + return map_func(ary_) else: try: - iterable = serialize_container(_ary) + iterable = serialize_container(ary_) except NotAnArrayContainerError: - return map_func(_ary) + return map_func(ary_) else: return reduce_func([ rec(subary) for _, subary in iterable diff --git a/test/test_arraycontext.py b/test/test_arraycontext.py index ab26330416a4628acaca3e4bb8a20b4078e1355d..14d24dd4ef7a6fe85766369c62a08e255cf476d9 100644 --- a/test/test_arraycontext.py +++ b/test/test_arraycontext.py @@ -263,11 +263,11 @@ def test_array_context_np_workalike(actx_factory, sym_name, n_args, dtype): "atan2": "arctan2", } - def evaluate(_np, *_args): - func = getattr(_np, sym_name, - getattr(_np, c_to_numpy_arc_functions.get(sym_name, sym_name))) + def evaluate(np_, *args_): + func = getattr(np_, sym_name, + getattr(np_, c_to_numpy_arc_functions.get(sym_name, sym_name))) - return func(*_args) + return func(*args_) assert_close_to_numpy_in_containers(actx, evaluate, args)