Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Refactor: modernize type hints and remove unused typing imports

raultejada2488d40055c2d1
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 6a9e00773..87ebaa7ef 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -14,9 +14,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Standard Library
-from typing import List
-
# Django
from django.db import models
@@ -120,7 +117,7 @@ class Day(models.Model):
"""
return self.routine
- def get_slots_gym_mode(self, iteration: int) -> List[SlotData]:
+ def get_slots_gym_mode(self, iteration: int) -> list[SlotData]:
"""
Return the sets for this day
"""
@@ -128,7 +125,7 @@ class Day(models.Model):
return [SlotData(comment=s.comment, sets=s.set_data_gym(iteration)) for s in slots]
- def get_slots_display_mode(self, iteration: int) -> List[SlotData]:
+ def get_slots_display_mode(self, iteration: int) -> list[SlotData]:
"""
Return the sets for this day.
diff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.py
index 379eb7df7..c7664d26a 100644
--- a/wger/manager/models/slot.py
+++ b/wger/manager/models/slot.py
@@ -1,6 +1,3 @@
-# Standard Library
-from typing import List
-
# Django
from django.db import models
@@ -72,7 +69,7 @@ class Slot(models.Model):
entries = getattr(self, 'prefetched_entries', self.entries.all())
return len(entries) > 1
- def set_data(self, iteration: int) -> List[SetExerciseData]:
+ def set_data(self, iteration: int) -> list[SetExerciseData]:
"""Calculates the set data for a specific iteration"""
entries = getattr(self, 'prefetched_entries', self.entries.all())
diff --git a/wger/manager/views/routine.py b/wger/manager/views/routine.py
index 9475c6b42..d7cef086a 100644
--- a/wger/manager/views/routine.py
+++ b/wger/manager/views/routine.py
@@ -18,7 +18,6 @@
import copy
import datetime
import logging
-from typing import List
# Django
from django.contrib.auth.decorators import login_required
@@ -53,7 +52,7 @@ def copy_routine(request, pk):
if not trainer_identity_pk or routine.user.pk != trainer_identity_pk:
return HttpResponseForbidden()
- def copy_config(configs: List[AbstractChangeConfig], slot_entry: SlotEntry):
+ def copy_config(configs: list[AbstractChangeConfig], slot_entry: SlotEntry):
for config in configs:
config_copy = copy.copy(config)
config_copy.pk = None
diff --git a/wger/nutrition/dataclasses.py b/wger/nutrition/dataclasses.py
index 6b999346b..08cafab8a 100644
--- a/wger/nutrition/dataclasses.py
+++ b/wger/nutrition/dataclasses.py
@@ -18,7 +18,6 @@ from dataclasses import (
dataclass,
)
from decimal import Decimal
-from typing import Optional
# wger
from wger.nutrition.consts import (
@@ -48,12 +47,12 @@ class IngredientData:
energy: float
protein: float
carbohydrates: float
- carbohydrates_sugar: Optional[float]
+ carbohydrates_sugar: float | None
fat: float
- fat_saturated: Optional[float]
- fiber: Optional[float]
- sodium: Optional[float]
- code: Optional[str]
+ fat_saturated: float | None
+ fiber: float | None
+ sodium: float | None
+ code: str | None
source_name: str
source_url: str
common_name: str | None
@@ -64,12 +63,12 @@ class IngredientData:
license_object_url: str
license_derivative_source_url: str = ''
license_author_url: str = ''
- is_vegan: Optional[bool] = None
- is_vegetarian: Optional[bool] = None
- serving_size_gram: Optional[int] = None
- serving_size_unit: Optional[str] = None
- serving_size_amount: Optional[float] = None
- nutriscore: Optional[str] = None
+ is_vegan: bool | None = None
+ is_vegetarian: bool | None = None
+ serving_size_gram: int | None = None
+ serving_size_unit: str | None = None
+ serving_size_amount: float | None = None
+ nutriscore: str | None = None
def sanity_checks(self):
if not self.name:
diff --git a/wger/nutrition/helpers.py b/wger/nutrition/helpers.py
index 522aca4ab..dd24db5ec 100644
--- a/wger/nutrition/helpers.py
+++ b/wger/nutrition/helpers.py
@@ -21,7 +21,6 @@ from dataclasses import (
dataclass,
)
from decimal import Decimal
-from typing import Union
# wger
from wger.nutrition.consts import KJ_PER_KCAL
@@ -75,16 +74,14 @@ class BaseMealItem:
@dataclass
class NutritionalValues:
- # TODO: replace the Union with | when we drop support for python 3.9
-
- energy: Union[Decimal, int, float] = 0
- protein: Union[Decimal, int, float] = 0
- carbohydrates: Union[Decimal, int, float] = 0
- carbohydrates_sugar: Union[Decimal, int, float, None] = None
- fat: Union[Decimal, int, float] = 0
- fat_saturated: Union[Decimal, int, float, None] = None
- fiber: Union[Decimal, int, float, None] = None
- sodium: Union[Decimal, int, float, None] = None
+ energy: Decimal | int | float = 0
+ protein: Decimal | int | float = 0
+ carbohydrates: Decimal | int | float = 0
+ carbohydrates_sugar: Decimal | int | float | None = None
+ fat: Decimal | int | float = 0
+ fat_saturated: Decimal | int | float | None = None
+ fiber: Decimal | int | float | None = None
+ sodium: Decimal | int | float | None = None
@property
def energy_kilojoule(self):