Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix import order and related comments
Roland Geider1b1727463874
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.pyindex 79f5efc2d..63e5eb125 100644--- a/wger/core/tests/test_preferences.py+++ b/wger/core/tests/test_preferences.py@@ -24,8 +24,8 @@ from django.utils import timezone# wgerfrom wger.core.tests.base_testcase import WgerTestCase-from wger.utils.constants import TWOPLACESfrom wger.measurements.models import Measurement+from wger.utils.constants import TWOPLACESlogger = logging.getLogger(__name__)diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.pyindex 5bac0ab90..72f13db90 100644--- a/wger/core/tests/test_temporary_users.py+++ b/wger/core/tests/test_temporary_users.py@@ -34,14 +34,14 @@ from wger.manager.models import (Routine,WorkoutLog,)-from wger.nutrition.models import (- Meal,- NutritionPlan,-)from wger.measurements.models import (Category,Measurement,)+from wger.nutrition.models import (+ Meal,+ NutritionPlan,+)class DemoUserTestCase(WgerTestCase):diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 2c9b95746..9001f3141 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -102,6 +102,7 @@ from wger.manager.models import (WorkoutLog,WorkoutSession,)+from wger.measurements.models import Measurementfrom wger.nutrition.models import NutritionPlanfrom wger.utils.api_token import (blacklist_jwt_refresh_tokens,@@ -118,7 +119,6 @@ from wger.utils.headless_long_lived import (revoke_all_long_lived_sessions,revoke_long_lived_session,)-from wger.measurements.models import Measurementlogger = logging.getLogger(__name__)diff --git a/wger/measurements/tests/test_measurements.py b/wger/measurements/tests/test_measurements.pyindex bba97306f..fc5934094 100644--- a/wger/measurements/tests/test_measurements.py+++ b/wger/measurements/tests/test_measurements.py@@ -23,8 +23,6 @@ from django.db import (IntegrityError,transaction,)--# Djangofrom django.urls import reverse# wgerdiff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.pyindex 74d28e90e..b7d446dd7 100644--- a/wger/nutrition/models/plan.py+++ b/wger/nutrition/models/plan.py@@ -26,11 +26,11 @@ from django.urls import reversefrom django.utils.timezone import make_aware# wger+from wger.measurements.models import Measurementfrom wger.nutrition.consts import ENERGY_FACTORfrom wger.nutrition.helpers import NutritionalValuesfrom wger.utils.cache import cache_mapperfrom wger.utils.uuid import uuid7-from wger.measurements.models import Measurementlogger = logging.getLogger(__name__)diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.pyindex 6923b5e27..8f3d08121 100644--- a/wger/nutrition/tests/test_calories_calculator.py+++ b/wger/nutrition/tests/test_calories_calculator.py@@ -23,9 +23,9 @@ from django.utils import timezone# wgerfrom wger.core.tests.base_testcase import WgerTestCase+from wger.measurements.models import Measurementfrom wger.nutrition.forms import BmrFormfrom wger.utils.constants import TWOPLACES-from wger.measurements.models import Measurementclass CaloriesCalculatorTestCase(WgerTestCase):diff --git a/wger/utils/username.py b/wger/utils/username.pyindex 9a78907e3..70104cf73 100644--- a/wger/utils/username.py+++ b/wger/utils/username.py@@ -14,7 +14,6 @@# Standard Libraryimport random-# Standard libraryimport re# Django