Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

fixing pep remarks

alois692477e5427d
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 6b1ccaa48..c30a3fda0 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -144,7 +144,10 @@ class Workout(models.Model):
day_canonical_repr.append(canonical_repr_day)
workout_canonical_form = {'obj': self,
- 'muscles': {'front': muscles_front, 'back': muscles_back, 'frontsecondary':muscles_front_secondary, 'backsecondary': muscles_back_secondary },
+ 'muscles': {'front': muscles_front,
+ 'back': muscles_back,
+ 'frontsecondary': muscles_front_secondary,
+ 'backsecondary': muscles_back_secondary},
'day_list': day_canonical_repr}
print(workout_canonical_form)
# Save to cache
@@ -437,7 +440,6 @@ class Day(models.Model):
muscles_front_secondary = []
muscles_back_secondary = []
-
for set_obj in self.set_set.select_related():
exercise_tmp = []
has_setting_tmp = True
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 2303618ca..69129c4a9 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -47,7 +47,10 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)],
'text': u'Tuesday'},
- 'muscles': {'back': [2], 'frontsecondary': [], 'backsecondary': [], 'front': [1]},
+ 'muscles': {'back': [2],
+ 'frontsecondary': [],
+ 'backsecondary': [],
+ 'front': [1]},
'obj': Day.objects.get(pk=1),
'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),
'comment_list': [u'test 123'],
@@ -59,14 +62,18 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_text': u'2 \xd7 8'}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'frontsecondary': [], 'backsecondary': [], 'front': [1]},
+ 'muscles': {'back': [2], 'frontsecondary': [],
+ 'backsecondary': [],
+ 'front': [1]},
'obj': Set.objects.get(pk=1)}]}
self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form)
canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)],
'text': u'Thursday'},
'obj': Day.objects.get(pk=2),
- 'muscles': {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []},
+ 'muscles': {'back': [2],
+ 'frontsecondary': [1], 'backsecondary': [1],
+ 'front': []},
'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
'comment_list': [u'Foobar'],
'has_weight': True,
@@ -80,14 +87,17 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_text': u'4 \xd7 10 (15kg)'}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []},
+ 'muscles': {'back': [2],
+ 'frontsecondary': [1], 'backsecondary': [1],
+ 'front': []},
'obj': Set.objects.get(pk=2)}]}
self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form)
canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)],
'text': u'Friday'},
'obj': Day.objects.get(pk=4),
- 'muscles': {'back': [], 'front': [],'frontsecondary': [], 'backsecondary': []},
+ 'muscles': {'back': [], 'front': [],
+ 'frontsecondary': [], 'backsecondary': []},
'set_list': []}
self.assertEqual(workout.canonical_representation['day_list'][2], canonical_form)
@@ -115,7 +125,8 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'setting_text': u'4 \xd7 10'}],
'is_superset': False,
'has_settings': True,
- 'muscles': {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []},
+ 'muscles': {'back': [2], 'frontsecondary': [1],
+ 'backsecondary': [1], 'front': []},
'obj': Set.objects.get(pk=3)}]
self.assertEqual(day.canonical_representation['set_list'], canonical_form)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 1262b78d1..5cc14cfcb 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -100,7 +100,6 @@ def view(request, pk):
if i not in muscles_back:
muscles_back.append('images/muscles/secondary/muscle-{0}.svg'.format(i))
-
# Append the silhouette of the human body as the last entry so the browser
# renders it in the background
muscles_front.append('images/muscles/muscular_system_front.svg')