| 1 |
From: Ben Hutchings <[email protected]> |
| 2 |
Date: Wed, 16 Aug 2023 01:47:43 +0200 |
| 3 |
Subject: Update for Jinja 3.0 |
| 4 |
|
| 5 |
We need to use the jinja2.utils.pass_context decorator instead |
| 6 |
of setting the contextfunction attribute on a callback. |
| 7 |
|
| 8 |
--- |
| 9 |
--- a/jinja_vanish/__init__.py |
| 10 |
+++ b/jinja_vanish/__init__.py |
| 11 |
@@ -3,6 +3,7 @@ from functools import wraps |
| 12 |
from markupsafe import Markup |
| 13 |
from jinja2 import Environment |
| 14 |
from jinja2.compiler import CodeGenerator |
| 15 |
+from jinja2.utils import pass_context |
| 16 |
|
| 17 |
|
| 18 |
class LocalOverridingCodeGenerator(CodeGenerator): |
| 19 |
@@ -35,12 +36,11 @@ class DynAutoEscapeEnvironment(Environme |
| 20 |
# suppling a no-op contextfunction itself or wrapping an existing |
| 21 |
# finalize in a contextfunction |
| 22 |
if self.finalize: |
| 23 |
- if not getattr(self.finalize, 'contextfunction', False): |
| 24 |
+ if not hasattr(self.finalize, 'jinja_pass_arg'): |
| 25 |
_finalize = getattr(self, 'finalize') |
| 26 |
- self.finalize = lambda _, v: _finalize(v) |
| 27 |
+ self.finalize = pass_context(lambda _, v: _finalize(v)) |
| 28 |
else: |
| 29 |
- self.finalize = lambda _, v: v |
| 30 |
- self.finalize.contextfunction = True |
| 31 |
+ self.finalize = pass_context(lambda _, v: v) |
| 32 |
|
| 33 |
self._codegen_overrides = {} |
| 34 |
|