-
-
Notifications
You must be signed in to change notification settings - Fork 195
Fix/missing context vars #453
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hazra1991
wants to merge
4
commits into
fabiocaccamo:main
Choose a base branch
from
hazra1991:fix/missing-context-vars
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
from django.template import Context, Template | ||
from django.test import SimpleTestCase | ||
|
||
|
||
class ResolveVariableTagTests(SimpleTestCase): | ||
def render_template(self, tpl, context=None): | ||
if context is None: | ||
context = {} | ||
return ( | ||
Template("{% load admin_interface_tags %}" + tpl) | ||
.render(Context(context)) | ||
.strip() | ||
) | ||
|
||
def test_returns_existing_variable(self): | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "myvar" as res %}{{ res }}', | ||
{"myvar": "hello"}, | ||
) | ||
self.assertEqual(out, "hello") | ||
|
||
def test_returns_default_when_missing(self): | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "missingvar" as res %}{{ res }}' | ||
) | ||
self.assertEqual(out, "") | ||
|
||
def test_returns_custom_default(self): | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "missingvar" "def" as res %}{{ res }}' | ||
) | ||
self.assertEqual(out, "def") | ||
|
||
def test_dotted_variable_existing(self): | ||
context = {"user": {"name": "alice"}} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "alice") | ||
|
||
def test_dotted_variable_missing_middle_key(self): | ||
context = {"user": {}} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" "def" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "def") | ||
|
||
def test_dotted_variable_missing_top_key(self): | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" "guest" as res %}{{ res }}' | ||
) | ||
self.assertEqual(out, "guest") | ||
|
||
def test_dotted_variable_with_object_attribute(self): | ||
class User: | ||
def __init__(self): | ||
self.name = "bob" | ||
|
||
context = {"user": User()} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "bob") | ||
|
||
def test_dotted_variable_partial_attribute_missing(self): | ||
class User: | ||
pass | ||
|
||
context = {"user": User()} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "") | ||
|
||
def test_non_dict_non_object_root(self): | ||
context = {"user": "notadict"} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.name" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "") | ||
|
||
def test_dotted_variable_object_with_nested_dict(self): | ||
class User: | ||
def __init__(self): | ||
self.info = {"name": "bob"} | ||
|
||
context = {"user": User()} | ||
out = self.render_template( | ||
'{% admin_interface_resolve_variable "user.info.name" as res %}{{ res }}', | ||
context, | ||
) | ||
self.assertEqual(out, "bob") |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
template.Variable(var_name).resolve(context)
already do all the resolution with dot syntax, so the code before is not necessary.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the feedback!
You’re right that
template.Variable(var_name).resolve(context)
already handles dotted lookups. Reason I added the pre-check is becauseVariable.resolve()
logs aVariableDoesNotExist
exception for every missing lookup,From Django’s source (django/template/base.py, around lines 913 and 939), you can see the logger call:
One possible workaround is to temporarily silence the django.template logger while resolving, and then restore its previous state:
This approach does work, but it temporarily changes the global logger state.
At the moment I haven’t found an alternative solution
Please let me know if there’s a cleaner hook in Django’s template system to avoid this log pollution.
Or else we can proceed with this changes to the logging itself temporarily.