Self hosted FLOSS fitness/workout, nutrition and weight tracker
Automatic linting
Github-actions63abe9508eec
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 251df802f..147686ab3 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -21,6 +21,7 @@ from django.contrib.auth import authenticatefrom django.contrib.auth.models import Userfrom django.contrib.auth.password_validation import validate_passwordfrom django.http import HttpRequest+# Third Partyfrom lingua import LanguageDetectorBuilderfrom rest_framework import serializers@@ -36,6 +37,7 @@ from wger.core.models import (WeightUnit,)+logger = logging.getLogger(__name__)@@ -250,10 +252,10 @@ class LanguageCheckSerializer(serializers.Serializer):'result': False,'detected_language': detected_language_code,'message': f'The detected language is "{detected_language.name.capitalize()}" ({detected_language_code}), '- f'which does not match your selected language "{language.full_name.capitalize()}" '- f'({language.short_name}). If you believe this is incorrect, try adding more content '- f'or rephrasing your text, as language detection works better with longer or more '- f'complete sentences.',+ f'which does not match your selected language "{language.full_name.capitalize()}" '+ f'({language.short_name}). If you believe this is incorrect, try adding more content '+ f'or rephrasing your text, as language detection works better with longer or more '+ f'complete sentences.',}})diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 4d6840231..055f7ff97 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -23,6 +23,7 @@ from django.conf import settingsfrom django.contrib.auth.models import Userfrom django.utils.decorators import method_decoratorfrom django.views.decorators.cache import cache_page+# Third Partyfrom django_email_verification import send_emailfrom drf_spectacular.types import OpenApiTypes@@ -77,6 +78,7 @@ from wger.version import (get_version,)+logger = logging.getLogger(__name__)diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex e650a4d3c..3d3edaa57 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -17,6 +17,7 @@ from django.conf import settingsfrom django.core.cache import cachefrom django.db import transactionfrom django.db.models import Q+# Third Partyfrom lingua import LanguageDetectorBuilderfrom rest_framework import serializers@@ -236,10 +237,10 @@ class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):raise serializers.ValidationError({'language': f'The detected language of the comment is "{detected_language.name.capitalize()}" '- f'({detected_language_code}), which does not match your selected language: '- f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '- f'this is incorrect, try adding more content or rephrasing your text, as '- f'language detection works better with longer or more complete sentences.'+ f'({detected_language_code}), which does not match your selected language: '+ f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '+ f'this is incorrect, try adding more content or rephrasing your text, as '+ f'language detection works better with longer or more complete sentences.'})@@ -422,10 +423,10 @@ class ExerciseTranslationSubmissionSerializer(serializers.ModelSerializer):raise serializers.ValidationError({'language': f'The detected language of the description is "{detected_language.name.capitalize()}" '- f'({detected_language_code}), which does not match your selected language: '- f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '- f'this is incorrect, try adding more content or rephrasing your text, as '- f'language detection works better with longer or more complete sentences.'+ f'({detected_language_code}), which does not match your selected language: '+ f'"{language.full_name.capitalize()}" ({language.short_name}). If you believe '+ f'this is incorrect, try adding more content or rephrasing your text, as '+ f'language detection works better with longer or more complete sentences.'})diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 3da321f07..2752dd4c2 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -17,10 +17,6 @@import loggingfrom uuid import UUID-# Third Party-import bleach-from actstream import action as actstream_action-from bleach.css_sanitizer import CSSSanitizer# Djangofrom django.conf import settingsfrom django.contrib.postgres.search import TrigramSimilarity@@ -28,6 +24,11 @@ from django.db.models import Qfrom django.utils.decorators import method_decoratorfrom django.utils.translation import gettext as _from django.views.decorators.cache import cache_page++# Third Party+import bleach+from actstream import action as actstream_action+from bleach.css_sanitizer import CSSSanitizerfrom drf_spectacular.types import OpenApiTypesfrom drf_spectacular.utils import (OpenApiParameter,@@ -91,6 +92,7 @@ from wger.utils.constants import (from wger.utils.db import is_postgres_dbfrom wger.utils.language import load_language+logger = logging.getLogger(__name__)diff --git a/wger/exercises/sync.py b/wger/exercises/sync.pyindex bb893bb00..b92d2a3b0 100644--- a/wger/exercises/sync.py+++ b/wger/exercises/sync.py@@ -15,13 +15,14 @@# Standard Libraryimport os-# Third Party-import requests# Djangofrom django.conf import settingsfrom django.core.files import Filefrom django.core.files.temp import NamedTemporaryFile+# Third Party+import requests+# wgerfrom wger.core.api.endpoints import (LANGUAGE_ENDPOINT,@@ -295,6 +296,7 @@ def handle_deleted_entries(style_fn=lambda x: x,):if not print_fn:+def print_fn(_):return Nonediff --git a/wger/urls.py b/wger/urls.pyindex 6f1aae6a0..0fffb8d6a 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -25,6 +25,7 @@ from django.contrib.sitemaps.views import (sitemap,)from django.urls import path+# Third Partyfrom django_email_verification import urls as email_urlsfrom drf_spectacular.views import (@@ -50,6 +51,7 @@ from wger.nutrition.api import views as nutrition_api_viewsfrom wger.utils.generic_views import TextTemplateViewfrom wger.weight.api import views as weight_api_views+## REST API#