Use stricter getattr() checks for decorator functions
Explicit checks for "is True" prevents unexpected behaviour with objects
that are callable and have permissive gettatr(), such as Mock.
Fixes #1145
diff --git a/src/jinja2/asyncfilters.py b/src/jinja2/asyncfilters.py
index d29f6c6..3d98dbc 100644
--- a/src/jinja2/asyncfilters.py
+++ b/src/jinja2/asyncfilters.py
@@ -26,17 +26,16 @@
def dualfilter(normal_filter, async_filter):
wrap_evalctx = False
- if getattr(normal_filter, "environmentfilter", False):
+ if getattr(normal_filter, "environmentfilter", False) is True:
def is_async(args):
return args[0].is_async
wrap_evalctx = False
else:
- if not getattr(normal_filter, "evalcontextfilter", False) and not getattr(
- normal_filter, "contextfilter", False
- ):
- wrap_evalctx = True
+ has_evalctxfilter = getattr(normal_filter, "evalcontextfilter", False) is True
+ has_ctxfilter = getattr(normal_filter, "contextfilter", False) is True
+ wrap_evalctx = not has_evalctxfilter and not has_ctxfilter
def is_async(args):
return args[0].environment.is_async
diff --git a/src/jinja2/compiler.py b/src/jinja2/compiler.py
index f450ec6..63297b4 100644
--- a/src/jinja2/compiler.py
+++ b/src/jinja2/compiler.py
@@ -1307,13 +1307,13 @@
def finalize(value):
return default(env_finalize(value))
- if getattr(env_finalize, "contextfunction", False):
+ if getattr(env_finalize, "contextfunction", False) is True:
src += "context, "
finalize = None # noqa: F811
- elif getattr(env_finalize, "evalcontextfunction", False):
+ elif getattr(env_finalize, "evalcontextfunction", False) is True:
src += "context.eval_ctx, "
finalize = None
- elif getattr(env_finalize, "environmentfunction", False):
+ elif getattr(env_finalize, "environmentfunction", False) is True:
src += "environment, "
def finalize(value):
@@ -1689,11 +1689,11 @@
func = self.environment.filters.get(node.name)
if func is None:
self.fail("no filter named %r" % node.name, node.lineno)
- if getattr(func, "contextfilter", False):
+ if getattr(func, "contextfilter", False) is True:
self.write("context, ")
- elif getattr(func, "evalcontextfilter", False):
+ elif getattr(func, "evalcontextfilter", False) is True:
self.write("context.eval_ctx, ")
- elif getattr(func, "environmentfilter", False):
+ elif getattr(func, "environmentfilter", False) is True:
self.write("environment, ")
# if the filter node is None we are inside a filter block
diff --git a/src/jinja2/environment.py b/src/jinja2/environment.py
index bf44b9d..8430390 100644
--- a/src/jinja2/environment.py
+++ b/src/jinja2/environment.py
@@ -492,20 +492,20 @@
if func is None:
fail_for_missing_callable("no filter named %r", name)
args = [value] + list(args or ())
- if getattr(func, "contextfilter", False):
+ if getattr(func, "contextfilter", False) is True:
if context is None:
raise TemplateRuntimeError(
"Attempted to invoke context filter without context"
)
args.insert(0, context)
- elif getattr(func, "evalcontextfilter", False):
+ elif getattr(func, "evalcontextfilter", False) is True:
if eval_ctx is None:
if context is not None:
eval_ctx = context.eval_ctx
else:
eval_ctx = EvalContext(self)
args.insert(0, eval_ctx)
- elif getattr(func, "environmentfilter", False):
+ elif getattr(func, "environmentfilter", False) is True:
args.insert(0, self)
return func(*args, **(kwargs or {}))
diff --git a/src/jinja2/nodes.py b/src/jinja2/nodes.py
index 9f3edc0..95bd614 100644
--- a/src/jinja2/nodes.py
+++ b/src/jinja2/nodes.py
@@ -671,7 +671,7 @@
# python 3. because of that, do not rename filter_ to filter!
filter_ = self.environment.filters.get(self.name)
- if filter_ is None or getattr(filter_, "contextfilter", False):
+ if filter_ is None or getattr(filter_, "contextfilter", False) is True:
raise Impossible()
# We cannot constant handle async filters, so we need to make sure
@@ -684,9 +684,9 @@
args, kwargs = args_as_const(self, eval_ctx)
args.insert(0, self.node.as_const(eval_ctx))
- if getattr(filter_, "evalcontextfilter", False):
+ if getattr(filter_, "evalcontextfilter", False) is True:
args.insert(0, eval_ctx)
- elif getattr(filter_, "environmentfilter", False):
+ elif getattr(filter_, "environmentfilter", False) is True:
args.insert(0, self.environment)
try:
diff --git a/src/jinja2/runtime.py b/src/jinja2/runtime.py
index 527d4b5..3ad7968 100644
--- a/src/jinja2/runtime.py
+++ b/src/jinja2/runtime.py
@@ -280,11 +280,11 @@
break
if callable(__obj):
- if getattr(__obj, "contextfunction", 0):
+ if getattr(__obj, "contextfunction", False) is True:
args = (__self,) + args
- elif getattr(__obj, "evalcontextfunction", 0):
+ elif getattr(__obj, "evalcontextfunction", False) is True:
args = (__self.eval_ctx,) + args
- elif getattr(__obj, "environmentfunction", 0):
+ elif getattr(__obj, "environmentfunction", False) is True:
args = (__self.environment,) + args
try:
return __obj(*args, **kwargs)
