mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-31 11:37:06 +00:00
Code Issues 32 Releases Wiki Activity

Refs #35738 -- Deprecated double-dot lookup.

Browse Source
This commit is contained in:
sanjeevholla26 2024-09-06 23:14:50 +05:30
parent 01a4d8a3c7
commit fea2c90322
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
django/template/base.py
View File

@ -53,6 +53,8 @@ times with multiple contexts)
import inspect
import logging
import re
import warnings
from django.utils.deprecation import RemovedInDjango61Warning
from enum import Enum
from django.template.context import BaseContext
@ -148,6 +150,8 @@ class Template:
if origin is None:
origin = Origin(UNKNOWN_SOURCE)
self.name = name
if self.name:
engine.current_template_name = self.name
self.origin = origin
self.engine = engine
self.source = str(template_string) # May be lazy.
@ -484,7 +488,7 @@ class Parser:
token, "Empty variable tag on line %d" % token.lineno
)
try:
filter_expression = self.compile_filter(token.contents)
filter_expression = self.compile_filter(token.contents, token.lineno)
except TemplateSyntaxError as e:
raise self.error(token, e)
var_node = VariableNode(filter_expression)
@ -598,11 +602,11 @@ class Parser:
self.tags.update(lib.tags)
self.filters.update(lib.filters)
def compile_filter(self, token):
def compile_filter(self, token, lineno=None):
"""
Convenient wrapper for FilterExpression
"""
return FilterExpression(token, self)
return FilterExpression(token, self, lineno)
def find_filter(self, filter_name):
if filter_name in self.filters:
@ -664,10 +668,11 @@ class FilterExpression:
<Variable: 'variable'>
"""
__slots__ = ("token", "filters", "var", "is_var")
__slots__ = ("token", "filters", "var", "is_var", "lineno")
def __init__(self, token, parser):
def __init__(self, token, parser, lineno):
self.token = token
self.lineno = lineno
matches = filter_re.finditer(token)
var_obj = None
filters = []
@ -682,7 +687,7 @@ class FilterExpression:
if var_obj is None:
if constant := match["constant"]:
try:
var_obj = Variable(constant).resolve({})
var_obj = Variable(constant, self.lineno).resolve({})
except VariableDoesNotExist:
var_obj = None
elif (var := match["var"]) is None:
@ -690,14 +695,14 @@ class FilterExpression:
"Could not find variable at start of %s." % token
)
else:
var_obj = Variable(var)
var_obj = Variable(var, self.lineno)
else:
filter_name = match["filter_name"]
args = []
if constant_arg := match["constant_arg"]:
args.append((False, Variable(constant_arg).resolve({})))
args.append((False, Variable(constant_arg, self.lineno).resolve({})))
elif var_arg := match["var_arg"]:
args.append((True, Variable(var_arg)))
args.append((True, Variable(var_arg, self.lineno)))
filter_func = parser.find_filter(filter_name)
self.args_check(filter_name, filter_func, args)
filters.append((filter_func, args))
@ -795,14 +800,15 @@ class Variable:
(The example assumes VARIABLE_ATTRIBUTE_SEPARATOR is '.')
"""
__slots__ = ("var", "literal", "lookups", "translate", "message_context")
__slots__ = ("var", "literal", "lookups", "translate", "message_context", "lineno")
def __init__(self, var):
def __init__(self, var, lineno=None):
self.var = var
self.literal = None
self.lookups = None
self.translate = False
self.message_context = None
self.lineno = lineno
if not isinstance(var, str):
raise TypeError("Variable must be a string or number, got %s" % type(var))
@ -843,6 +849,17 @@ class Variable:
)
self.lookups = tuple(var.split(VARIABLE_ATTRIBUTE_SEPARATOR))
if "" in self.lookups:
from .engine import Engine
engine = Engine.get_default()
warnings.warn(
f"Double-dot lookup (e.g., '{{{{ {var} }}}}') in template {engine.current_template_name}[{self.lineno}] "
"is deprecated.",
RemovedInDjango61Warning,
stacklevel=2
)
def resolve(self, context):
"""Resolve this variable against a given context."""
if self.lookups is not None: