From 32abdbafaed74a0a9dbf3c75401dfa1002f62ba6 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@gmail.com>
Date: Mon, 24 May 2021 12:42:57 +0100
Subject: [PATCH] fastapi: Jinja contextfilter renamed to pass_context

Closes: #23

Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
---
 aurweb/captcha.py | 6 +++---
 aurweb/l10n.py    | 4 ++--
 aurweb/util.py    | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/aurweb/captcha.py b/aurweb/captcha.py
index 5475d85f..9451f42c 100644
--- a/aurweb/captcha.py
+++ b/aurweb/captcha.py
@@ -1,7 +1,7 @@
 """ This module consists of aurweb's CAPTCHA utility functions and filters. """
 import hashlib
 
-import jinja2
+from jinja2 import pass_context
 
 from aurweb.db import query
 from aurweb.models.user import User
@@ -41,14 +41,14 @@ def get_captcha_answer(token):
     return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
 
 
-@jinja2.contextfilter
+@pass_context
 def captcha_salt_filter(context):
     """ Returns the most recent CAPTCHA salt in the list of salts. """
     salts = get_captcha_salts()
     return salts[0]
 
 
-@jinja2.contextfilter
+@pass_context
 def captcha_cmdline_filter(context, salt):
     """ Returns a CAPTCHA challenge for a given salt. """
     return get_captcha_challenge(salt)
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index 4a5c1a46..9270f3ce 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -4,7 +4,7 @@ import typing
 from collections import OrderedDict
 
 from fastapi import Request
-from jinja2 import contextfilter
+from jinja2 import pass_context
 
 import aurweb.config
 
@@ -88,7 +88,7 @@ def get_translator_for_request(request: Request):
     return translate
 
 
-@contextfilter
+@pass_context
 def tr(context: typing.Any, value: str):
     """ A translation filter; example: {{ "Hello" | tr("de") }}. """
     _ = get_translator_for_request(context.get("request"))
diff --git a/aurweb/util.py b/aurweb/util.py
index 8b6ddbe7..8e4b291d 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -5,9 +5,8 @@ import string
 
 from urllib.parse import urlparse
 
-import jinja2
-
 from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
+from jinja2 import pass_context
 
 import aurweb.config
 
@@ -88,7 +87,7 @@ def migrate_cookies(request, response):
     return response
 
 
-@jinja2.contextfilter
+@pass_context
 def account_url(context, user):
     request = context.get("request")
     base = f"{request.url.scheme}://{request.url.hostname}"