Skip to content

Commit

Permalink
Merge pull request #1647 from Tom-Brouwer/202204/add-missing-overlay-…
Browse files Browse the repository at this point in the history
…options

Add missing environment options to the Environment.overlay method
  • Loading branch information
davidism authored Apr 4, 2022
2 parents ea69e41 + 5d3d241 commit 990602f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ Version 3.1.2

Unreleased

- Add parameters to ``Environment.overlay`` to match ``__init__``.
:issue:`1645`


Version 3.1.1
-------------
Expand Down
12 changes: 11 additions & 1 deletion src/jinja2/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ def overlay(
line_comment_prefix: t.Optional[str] = missing,
trim_blocks: bool = missing,
lstrip_blocks: bool = missing,
newline_sequence: "te.Literal['\\n', '\\r\\n', '\\r']" = missing,
keep_trailing_newline: bool = missing,
extensions: t.Sequence[t.Union[str, t.Type["Extension"]]] = missing,
optimized: bool = missing,
undefined: t.Type[Undefined] = missing,
Expand All @@ -402,6 +404,7 @@ def overlay(
cache_size: int = missing,
auto_reload: bool = missing,
bytecode_cache: t.Optional["BytecodeCache"] = missing,
enable_async: bool = False,
) -> "Environment":
"""Create a new overlay environment that shares all the data with the
current environment except for cache and the overridden attributes.
Expand All @@ -413,9 +416,13 @@ def overlay(
up completely. Not all attributes are truly linked, some are just
copied over so modifications on the original environment may not shine
through.
.. versionchanged:: 3.1.2
Added the ``newline_sequence``,, ``keep_trailing_newline``,
and ``enable_async`` parameters to match ``__init__``.
"""
args = dict(locals())
del args["self"], args["cache_size"], args["extensions"]
del args["self"], args["cache_size"], args["extensions"], args["enable_async"]

rv = object.__new__(self.__class__)
rv.__dict__.update(self.__dict__)
Expand All @@ -437,6 +444,9 @@ def overlay(
if extensions is not missing:
rv.extensions.update(load_extensions(rv, extensions))

if enable_async is not missing:
rv.is_async = enable_async

return _environment_config_check(rv)

@property
Expand Down
4 changes: 2 additions & 2 deletions src/jinja2/visitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ def visit(self, node: Node, *args: t.Any, **kwargs: t.Any) -> t.Any:

def generic_visit(self, node: Node, *args: t.Any, **kwargs: t.Any) -> t.Any:
"""Called if no explicit visitor function exists for a node."""
for node in node.iter_child_nodes():
self.visit(node, *args, **kwargs)
for child_node in node.iter_child_nodes():
self.visit(child_node, *args, **kwargs)


class NodeTransformer(NodeVisitor):
Expand Down

0 comments on commit 990602f

Please sign in to comment.