From cbd3de88c4dec272e8b29e4cfbf7ac26544bc51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Wed, 18 Mar 2026 15:28:51 +0100 Subject: [PATCH] refactor: remove unused `Jinja2Templates` super class (#3803) --- lnbits/helpers.py | 5 ++--- lnbits/jinja2_templating.py | 28 ---------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 lnbits/jinja2_templating.py diff --git a/lnbits/helpers.py b/lnbits/helpers.py index b18228737..8bcb2a013 100644 --- a/lnbits/helpers.py +++ b/lnbits/helpers.py @@ -7,15 +7,14 @@ from typing import Any from urllib import request from urllib.parse import urlparse -import jinja2 import jwt import shortuuid from fastapi.routing import APIRoute from loguru import logger from packaging import version from pydantic.schema import field_schema +from starlette.templating import Jinja2Templates -from lnbits.jinja2_templating import Jinja2Templates from lnbits.settings import settings from lnbits.utils.crypto import AESCipher from lnbits.utils.exchange_rates import currencies @@ -66,7 +65,7 @@ def template_renderer(additional_folders: list | None = None) -> Jinja2Templates for f in additional_folders ] folders.extend(additional_folders) - t = Jinja2Templates(loader=jinja2.FileSystemLoader(folders)) + t = Jinja2Templates(directory=folders) t.env.globals["static_url_for"] = static_url_for t.env.globals["normalize_path"] = normalize_path diff --git a/lnbits/jinja2_templating.py b/lnbits/jinja2_templating.py deleted file mode 100644 index ac15280ec..000000000 --- a/lnbits/jinja2_templating.py +++ /dev/null @@ -1,28 +0,0 @@ -import typing - -from jinja2 import BaseLoader, Environment, pass_context -from starlette.datastructures import QueryParams -from starlette.requests import Request -from starlette.templating import Jinja2Templates as SuperJinja2Templates - - -class Jinja2Templates(SuperJinja2Templates): - def __init__(self, loader: BaseLoader) -> None: - self.env = self.get_environment(loader) - super().__init__(env=self.env) - - def get_environment(self, loader: BaseLoader) -> Environment: - @pass_context - def url_for(context: dict, name: str, **path_params: typing.Any) -> str: - request: Request = context["request"] - return request.app.url_path_for(name, **path_params) - - def url_params_update(init: QueryParams, **new: typing.Any) -> QueryParams: - values = dict(init) - values.update(new) - return QueryParams(**values) - - env = Environment(loader=loader, autoescape=True) - env.globals["url_for"] = url_for - env.globals["url_params_update"] = url_params_update - return env