From d8f7379952b78477d142dc4e041b2979ac11908e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Fri, 20 May 2022 23:15:49 +0200 Subject: [PATCH] misc: remove |get template filter from combo (#65540) it is defined publik-django-templatetags --- combo/public/templatetags/combo.py | 11 ------- tests/test_public_templatetags.py | 53 ------------------------------ 2 files changed, 64 deletions(-) diff --git a/combo/public/templatetags/combo.py b/combo/public/templatetags/combo.py index d69f55e0..42ae69f8 100644 --- a/combo/public/templatetags/combo.py +++ b/combo/public/templatetags/combo.py @@ -331,17 +331,6 @@ def has_role(user, groupname): return user.groups.filter(name=groupname).exists() -@register.filter(name='get') -def get(obj, key): - try: - return obj.get(key) - except AttributeError: - try: - return obj[key] - except (IndexError, KeyError, TypeError): - return None - - @register.filter def split(string, separator=' '): return (force_text(string) or '').split(separator) diff --git a/tests/test_public_templatetags.py b/tests/test_public_templatetags.py index 76bbec86..8d4aa6e6 100644 --- a/tests/test_public_templatetags.py +++ b/tests/test_public_templatetags.py @@ -121,59 +121,6 @@ def test_has_role(): assert t.render(context) == 'False' -def test_get(): - t = Template('{{ foo|get:"foo-bar" }}') - context = Context({'foo': {'foo-bar': 'hello'}}) - assert t.render(context) == 'hello' - context = Context({'foo': {'bar-foo': 'hello'}}) - assert t.render(context) == 'None' - context = Context({'foo': None}) - assert t.render(context) == 'None' - - t = Template('{{ foo|get:"foo-bar"|default:"" }}') - context = Context({'foo': {'rab': 'hello'}}) - assert t.render(context) == '' - - t = Template('{{ foo|get:key }}') - context = Context({'foo': {'foo-bar': 'hello'}, 'key': 'foo-bar'}) - assert t.render(context) == 'hello' - - -def test_getlist(): - # nothing in context - t = Template('{% for v in values|getlist:"foo" %}{{ v }},{% endfor %}') - context = Context() - assert t.render(context) == '' - # non value - t = Template('{% for v in values|getlist:"foo" %}{{ v }},{% endfor %}') - context = Context({'values': None}) - assert t.render(context) == '' - # not a list - t = Template('{% for v in values|getlist:"foo" %}{{ v }},{% endfor %}') - context = Context({'values': 'foo'}) - assert t.render(context) == 'None,None,None,' - # not a list of dict - t = Template('{% for v in values|getlist:"foo" %}{{ v }},{% endfor %}') - context = Context({'values': ['foo']}) - assert t.render(context) == 'None,' - - t = Template('{% for v in values|getlist:"foo" %}{{ v }},{% endfor %}') - context = Context({'values': [{'foo': 'bar'}, {'foo': 'baz'}]}) - assert t.render(context) == 'bar,baz,' - t = Template('{% for v in values|getlist:"unknown" %}{{ v }},{% endfor %}') - context = Context({'values': [{'foo': 'bar'}, {'foo': 'baz'}]}) - assert t.render(context) == 'None,None,' - t = Template('{% for v in values|getlist:"k"|getlist:"v" %}{{ v }},{% endfor %}') - context = Context({'values': [{'k': {'v': 'bar'}}, {'k': {'v': 'baz'}}]}) - assert t.render(context) == 'bar,baz,' - t = Template('{% for v in values|getlist:"k"|getlist:"unknown" %}{{ v }},{% endfor %}') - context = Context({'values': [{'k': {'v': 'bar'}}, {'k': {'v': 'baz'}}]}) - assert t.render(context) == 'None,None,' - t = Template('{% for v in values|getlist:"k"|getlist:"v" %}{{ v }},{% endfor %}') - context = Context({'values': [{'k': None}, {'k': {'v': 'baz'}}]}) - assert t.render(context) == 'None,baz,' - - def test_split(): t = Template('{% for x in plop|split %}{{x}}
{% endfor %}') assert t.render(Context({'plop': 'ab cd ef'})) == 'ab
cd
ef
'