diff options
| -rw-r--r-- | ihatemoney/forms.py | 2 | ||||
| -rw-r--r-- | ihatemoney/run.py | 4 | ||||
| -rw-r--r-- | ihatemoney/tests/main_test.py | 2 | ||||
| -rw-r--r-- | ihatemoney/web.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ihatemoney/forms.py b/ihatemoney/forms.py index f6e8961..9f8eefa 100644 --- a/ihatemoney/forms.py +++ b/ihatemoney/forms.py @@ -6,7 +6,7 @@ from flask import request from flask_babel import lazy_gettext as _ from flask_wtf.file import FileAllowed, FileField, FileRequired from flask_wtf.form import FlaskForm -from jinja2 import Markup +from markupsafe import Markup from werkzeug.security import check_password_hash, generate_password_hash from wtforms.fields.core import Label, SelectField, SelectMultipleField from wtforms.fields.html5 import DateField, DecimalField, URLField diff --git a/ihatemoney/run.py b/ihatemoney/run.py index 4ce8aaa..fc927e4 100644 --- a/ihatemoney/run.py +++ b/ihatemoney/run.py @@ -7,7 +7,7 @@ from flask import Flask, g, render_template, request, session from flask_babel import Babel, format_currency from flask_mail import Mail from flask_migrate import Migrate, stamp, upgrade -from jinja2 import contextfilter +from jinja2 import pass_context from werkzeug.middleware.proxy_fix import ProxyFix from ihatemoney import default_settings @@ -158,7 +158,7 @@ def create_app( # Undocumented currencyformat filter from flask_babel is forwarding to Babel format_currency # We overwrite it to remove the currency sign ยค when there is no currency - @contextfilter + @pass_context def currency(context, number, currency=None, *args, **kwargs): if currency is None: currency = context.get("g").project.default_currency diff --git a/ihatemoney/tests/main_test.py b/ihatemoney/tests/main_test.py index d495f3a..2e7742f 100644 --- a/ihatemoney/tests/main_test.py +++ b/ihatemoney/tests/main_test.py @@ -95,7 +95,7 @@ class CommandTestCase(BaseTestCase): def test_demo_project_deletion(self): self.create_project("demo") - self.assertEquals(models.Project.query.get("demo").name, "demo") + self.assertEqual(models.Project.query.get("demo").name, "demo") runner = self.app.test_cli_runner() runner.invoke(delete_project, "demo") diff --git a/ihatemoney/web.py b/ihatemoney/web.py index 106a85c..baacff4 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -549,7 +549,7 @@ def export_project(file, format): return send_file( file2export, - attachment_filename=f"{g.project.id}-{file}.{format}", + download_name=f"{g.project.id}-{file}.{format}", as_attachment=True, ) |