Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

ran flake8 and isort

Lydia Xingf20935a036e0
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index a56aef899..db2297b65 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -76,16 +76,16 @@ from wger.exercises.models import (
Muscle
)
from wger.manager.models import WorkoutLog
+from wger.utils.constants import MIN_EDIT_DISTANCE_THRESHOLD
from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin
)
+from wger.utils.helpers import levenshtein
from wger.utils.language import (
load_item_languages,
load_language
)
-from wger.utils.constants import MIN_EDIT_DISTANCE_THRESHOLD
-from wger.utils.helpers import levenshtein
from wger.utils.widgets import TranslatedSelectMultiple
from wger.weight.helpers import process_log_entries
@@ -167,12 +167,12 @@ class ExerciseForm(ModelForm):
category = ModelChoiceField(queryset=ExerciseCategory.objects.all(),
widget=Select())
muscles = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
- widget=CheckboxSelectMultiple(),
- required=False)
+ widget=CheckboxSelectMultiple(),
+ required=False)
muscles_secondary = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
- widget=CheckboxSelectMultiple(),
- required=False)
+ widget=CheckboxSelectMultiple(),
+ required=False)
description = CharField(label=_('Description'),
widget=Textarea,
@@ -182,13 +182,13 @@ class ExerciseForm(ModelForm):
model = Exercise
widgets = {'equipment': TranslatedSelectMultiple()}
fields = ['name_original',
- 'category',
- 'description',
- 'muscles',
- 'muscles_secondary',
- 'equipment',
- 'license',
- 'license_author']
+ 'category',
+ 'description',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ 'license',
+ 'license_author']
class Media:
js = (settings.STATIC_URL + 'yarn/tinymce/tinymce.min.js',)
@@ -200,12 +200,13 @@ class ExerciseForm(ModelForm):
.filter(language__in=languages)
for exercise in exercises:
exercise_name = str(exercise)
- if levenshtein(exercise_name.casefold(), name_original.casefold()) < MIN_EDIT_DISTANCE_THRESHOLD:
+ min_edit_dist = levenshtein(exercise_name.casefold(), name_original.casefold())
+ if min_edit_dist < MIN_EDIT_DISTANCE_THRESHOLD:
raise ValidationError(
_('%(name_original)s is too similar to existing exercise "%(exercise_name)s"'),
params={'name_original': name_original, 'exercise_name': exercise_name},
)
- return data
+ return name_original
class ExercisesEditAddView(WgerFormMixin):
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index 4b3e1389d..ef6aff772 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -236,6 +236,7 @@ def smart_capitalize(input):
out.append(word)
return ' '.join(out)
+
def levenshtein(s1, s2):
"""
The Levenshtein distance
@@ -254,7 +255,7 @@ def levenshtein(s1, s2):
distances = range(len(s1) + 1)
for i2, c2 in enumerate(s2):
- distances_ = [i2+1]
+ distances_ = [i2 + 1]
for i1, c1 in enumerate(s1):
if c1 == c2:
distances_.append(distances[i1])