Skip to content

armgit / wger

Public Imported from GitHub
0

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.py
index 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
# wger
from wger.core.tests.base_testcase import WgerTestCase
-from wger.utils.constants import TWOPLACES
from wger.measurements.models import Measurement
+from wger.utils.constants import TWOPLACES
logger = logging.getLogger(__name__)
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index 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.py
index 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 Measurement
from wger.nutrition.models import NutritionPlan
from 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 Measurement
logger = logging.getLogger(__name__)
diff --git a/wger/measurements/tests/test_measurements.py b/wger/measurements/tests/test_measurements.py
index 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,
)
-
-# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.py
index 74d28e90e..b7d446dd7 100644
--- a/wger/nutrition/models/plan.py
+++ b/wger/nutrition/models/plan.py
@@ -26,11 +26,11 @@ from django.urls import reverse
from django.utils.timezone import make_aware
# wger
+from wger.measurements.models import Measurement
from wger.nutrition.consts import ENERGY_FACTOR
from wger.nutrition.helpers import NutritionalValues
from wger.utils.cache import cache_mapper
from wger.utils.uuid import uuid7
-from wger.measurements.models import Measurement
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.py
index 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
# wger
from wger.core.tests.base_testcase import WgerTestCase
+from wger.measurements.models import Measurement
from wger.nutrition.forms import BmrForm
from wger.utils.constants import TWOPLACES
-from wger.measurements.models import Measurement
class CaloriesCalculatorTestCase(WgerTestCase):
diff --git a/wger/utils/username.py b/wger/utils/username.py
index 9a78907e3..70104cf73 100644
--- a/wger/utils/username.py
+++ b/wger/utils/username.py
@@ -14,7 +14,6 @@
# Standard Library
import random
-# Standard library
import re
# Django