diff --git a/ihatemoney/currency_convertor.py b/ihatemoney/currency_convertor.py index efb34b8a..75fa8342 100644 --- a/ihatemoney/currency_convertor.py +++ b/ihatemoney/currency_convertor.py @@ -1,5 +1,5 @@ +from cachetools import TTLCache, cached import requests -from cachetools import cached, TTLCache class Singleton(type): diff --git a/ihatemoney/forms.py b/ihatemoney/forms.py index 9277c92f..7a6a57e4 100644 --- a/ihatemoney/forms.py +++ b/ihatemoney/forms.py @@ -1,3 +1,4 @@ +import copy from datetime import datetime from re import match @@ -5,15 +6,12 @@ import email_validator from flask import request from flask_babel import lazy_gettext as _ from flask_wtf.file import FileAllowed, FileField, FileRequired -import copy - from flask_wtf.form import FlaskForm from jinja2 import Markup from werkzeug.security import check_password_hash, generate_password_hash -from wtforms.fields.core import SelectField, SelectMultipleField +from wtforms.fields.core import Label, SelectField, SelectMultipleField from wtforms.fields.html5 import DateField, DecimalField, URLField from wtforms.fields.simple import BooleanField, PasswordField, StringField, SubmitField -from wtforms.fields.core import Label from wtforms.validators import ( DataRequired, Email, @@ -23,9 +21,9 @@ from wtforms.validators import ( ValidationError, ) +from ihatemoney.currency_convertor import CurrencyConverter from ihatemoney.models import LoggingMode, Person, Project from ihatemoney.utils import eval_arithmetic_expression, slugify -from ihatemoney.currency_convertor import CurrencyConverter def strip_filter(string): diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py index b7f4d12b..fb314bfc 100644 --- a/ihatemoney/tests/tests.py +++ b/ihatemoney/tests/tests.py @@ -6,7 +6,7 @@ import json import os from time import sleep import unittest -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch from flask import session from flask_testing import TestCase @@ -14,8 +14,8 @@ from sqlalchemy import orm from werkzeug.security import check_password_hash, generate_password_hash from ihatemoney import history, models, utils -from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash from ihatemoney.currency_convertor import CurrencyConverter +from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash from ihatemoney.run import create_app, db, load_configuration from ihatemoney.versioning import LoggingMode