Skip to content

Commit 8b51452

Browse files
rolandgeiderrolandgeider
authored
Merge pull request #2061 from seppzer0/master
refactor: make fields collections immutable
2 parents a80400b + 22c3424 commit 8b51452

28 files changed

+114
-120
lines changed

‎wger/config/apps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ class ConfigConfig(AppConfig):
2323
verbose_name = 'Config'
2424

2525
def ready(self):
26-
import wger.config.signals
26+
import wger.config.signals # noqa: F401

‎wger/config/views/gym_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
3636
"""
3737

3838
model = GymConfig
39-
fields = ['default_gym']
39+
fields = ('default_gym',)
4040
permission_required = 'config.change_gymconfig'
4141
success_url = reverse_lazy('gym:gym:list')
4242
title = gettext_lazy('Edit')

‎wger/core/api/serializers.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class UserprofileSerializer(serializers.ModelSerializer):
5252

5353
class Meta:
5454
model = UserProfile
55-
fields = [
55+
fields = (
5656
'username',
5757
'email',
5858
'email_verified',
@@ -84,7 +84,7 @@ class Meta:
8484
'weight_unit',
8585
'ro_access',
8686
'num_days_weight_reminder',
87-
]
87+
)
8888

8989

9090
class UserLoginSerializer(serializers.ModelSerializer):
@@ -98,7 +98,7 @@ class UserLoginSerializer(serializers.ModelSerializer):
9898

9999
class Meta:
100100
model = User
101-
fields = ['username', 'password', 'email']
101+
fields = ('username', 'password', 'email')
102102

103103
def __init__(self, request: HttpRequest = None, instance=None, data=empty, **kwargs):
104104
self.request = request
@@ -157,12 +157,12 @@ class LanguageSerializer(serializers.ModelSerializer):
157157

158158
class Meta:
159159
model = Language
160-
fields = [
160+
fields = (
161161
'id',
162162
'short_name',
163163
'full_name',
164164
'full_name_en',
165-
]
165+
)
166166

167167

168168
class LicenseSerializer(serializers.ModelSerializer):
@@ -172,12 +172,12 @@ class LicenseSerializer(serializers.ModelSerializer):
172172

173173
class Meta:
174174
model = License
175-
fields = [
175+
fields = (
176176
'id',
177177
'full_name',
178178
'short_name',
179179
'url',
180-
]
180+
)
181181

182182

183183
class RepetitionUnitSerializer(serializers.ModelSerializer):
@@ -187,7 +187,7 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):
187187

188188
class Meta:
189189
model = RepetitionUnit
190-
fields = ['id', 'name']
190+
fields = ('id', 'name')
191191

192192

193193
class RoutineWeightUnitSerializer(serializers.ModelSerializer):
@@ -197,7 +197,7 @@ class RoutineWeightUnitSerializer(serializers.ModelSerializer):
197197

198198
class Meta:
199199
model = WeightUnit
200-
fields = ['id', 'name']
200+
fields = ('id', 'name')
201201

202202

203203
class LanguageCheckSerializer(serializers.Serializer):

‎wger/core/views/languages.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMi
7070
"""
7171

7272
model = Language
73-
fields = ['short_name', 'full_name', 'full_name_en']
73+
fields = ('short_name', 'full_name', 'full_name_en')
7474
title = gettext_lazy('Add')
7575
permission_required = 'core.add_language'
7676

@@ -100,7 +100,7 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
100100
"""
101101

102102
model = Language
103-
fields = ['short_name', 'full_name', 'full_name_en']
103+
fields = ('short_name', 'full_name', 'full_name_en')
104104
permission_required = 'core.change_language'
105105

106106
def get_context_data(self, **kwargs):

‎wger/core/views/license.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class LicenseAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
6161
"""
6262

6363
model = License
64-
fields = ['full_name', 'short_name', 'url']
64+
fields = ('full_name', 'short_name', 'url')
6565
success_url = reverse_lazy('core:license:list')
6666
title = gettext_lazy('Add')
6767
permission_required = 'core.add_license'
@@ -73,7 +73,7 @@ class LicenseUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMix
7373
"""
7474

7575
model = License
76-
fields = ['full_name', 'short_name', 'url']
76+
fields = ('full_name', 'short_name', 'url')
7777
success_url = reverse_lazy('core:license:list')
7878
permission_required = 'core.change_license'
7979

‎wger/core/views/repetition_units.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
6262
"""
6363

6464
model = RepetitionUnit
65-
fields = ['name']
65+
fields = ('name',)
6666
title = gettext_lazy('Add')
6767
success_url = reverse_lazy('core:repetition-unit:list')
6868
permission_required = 'core.add_repetitionunit'
@@ -74,7 +74,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
7474
"""
7575

7676
model = RepetitionUnit
77-
fields = ['name']
77+
fields = ('name',)
7878
success_url = reverse_lazy('core:repetition-unit:list')
7979
permission_required = 'core.change_repetitionunit'
8080

‎wger/core/views/weight_units.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
6262
"""
6363

6464
model = WeightUnit
65-
fields = ['name']
65+
fields = ('name',)
6666
title = gettext_lazy('Add')
6767
success_url = reverse_lazy('core:weight-unit:list')
6868
permission_required = 'core.add_weightunit'
@@ -74,7 +74,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
7474
"""
7575

7676
model = WeightUnit
77-
fields = ['name']
77+
fields = ('name',)
7878
success_url = reverse_lazy('core:weight-unit:list')
7979
permission_required = 'core.change_weightunit'
8080

‎wger/exercises/api/serializers.py‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ExerciseSerializer(serializers.ModelSerializer):
5151

5252
class Meta:
5353
model = Exercise
54-
fields = [
54+
fields = (
5555
'id',
5656
'uuid',
5757
'created',
@@ -62,7 +62,7 @@ class Meta:
6262
'equipment',
6363
'variations',
6464
'license_author',
65-
]
65+
)
6666

6767

6868
class EquipmentSerializer(serializers.ModelSerializer):
@@ -72,7 +72,7 @@ class EquipmentSerializer(serializers.ModelSerializer):
7272

7373
class Meta:
7474
model = Equipment
75-
fields = ['id', 'name']
75+
fields = ('id', 'name')
7676

7777

7878
class DeletionLogSerializer(serializers.ModelSerializer):
@@ -82,13 +82,13 @@ class DeletionLogSerializer(serializers.ModelSerializer):
8282

8383
class Meta:
8484
model = DeletionLog
85-
fields = [
85+
fields = (
8686
'model_type',
8787
'uuid',
8888
'replaced_by',
8989
'timestamp',
9090
'comment',
91-
]
91+
)
9292

9393

9494
class ExerciseImageSerializer(serializers.ModelSerializer):
@@ -101,7 +101,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
101101

102102
class Meta:
103103
model = ExerciseImage
104-
fields = [
104+
fields = (
105105
'id',
106106
'uuid',
107107
'exercise',
@@ -116,7 +116,7 @@ class Meta:
116116
'license_author_url',
117117
'license_derivative_source_url',
118118
'author_history',
119-
]
119+
)
120120

121121

122122
class ExerciseVideoSerializer(serializers.ModelSerializer):
@@ -129,7 +129,7 @@ class ExerciseVideoSerializer(serializers.ModelSerializer):
129129

130130
class Meta:
131131
model = ExerciseVideo
132-
fields = [
132+
fields = (
133133
'id',
134134
'uuid',
135135
'exercise',
@@ -149,7 +149,7 @@ class Meta:
149149
'license_author_url',
150150
'license_derivative_source_url',
151151
'author_history',
152-
]
152+
)
153153

154154

155155
class ExerciseVideoInfoSerializer(serializers.ModelSerializer):
@@ -161,7 +161,7 @@ class ExerciseVideoInfoSerializer(serializers.ModelSerializer):
161161

162162
class Meta:
163163
model = ExerciseVideo
164-
fields = [
164+
fields = (
165165
'id',
166166
'uuid',
167167
'exercise',
@@ -180,7 +180,7 @@ class Meta:
180180
'license_author_url',
181181
'license_derivative_source_url',
182182
'author_history',
183-
]
183+
)
184184

185185

186186
class ExerciseCommentSerializer(serializers.ModelSerializer):
@@ -192,12 +192,12 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):
192192

193193
class Meta:
194194
model = ExerciseComment
195-
fields = [
195+
fields = (
196196
'id',
197197
'uuid',
198198
'translation',
199199
'comment',
200-
]
200+
)
201201

202202

203203
class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):
@@ -207,9 +207,7 @@ class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):
207207

208208
class Meta:
209209
model = ExerciseComment
210-
fields = [
211-
'comment',
212-
]
210+
fields = ('comment',)
213211

214212
def create(self, validated_data, **kwargs):
215213
"""
@@ -259,12 +257,12 @@ class ExerciseAliasSerializer(serializers.ModelSerializer):
259257

260258
class Meta:
261259
model = Alias
262-
fields = [
260+
fields = (
263261
'id',
264262
'uuid',
265263
'translation',
266264
'alias',
267-
]
265+
)
268266

269267

270268
class ExerciseAliasSubmissionSerializer(serializers.ModelSerializer):
@@ -274,9 +272,7 @@ class ExerciseAliasSubmissionSerializer(serializers.ModelSerializer):
274272

275273
class Meta:
276274
model = Alias
277-
fields = [
278-
'alias',
279-
]
275+
fields = ('alias',)
280276

281277
def create(self, validated_data, **kwargs):
282278
"""
@@ -301,9 +297,7 @@ class ExerciseVariationSerializer(serializers.ModelSerializer):
301297

302298
class Meta:
303299
model = Variation
304-
fields = [
305-
'id',
306-
]
300+
fields = ('id',)
307301

308302

309303
class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
@@ -313,11 +307,11 @@ class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
313307

314308
class Meta:
315309
model = Alias
316-
fields = [
310+
fields = (
317311
'id',
318312
'uuid',
319313
'alias',
320-
]
314+
)
321315

322316

323317
class ExerciseCategorySerializer(serializers.ModelSerializer):
@@ -327,7 +321,7 @@ class ExerciseCategorySerializer(serializers.ModelSerializer):
327321

328322
class Meta:
329323
model = ExerciseCategory
330-
fields = ['id', 'name']
324+
fields = ('id', 'name')
331325

332326

333327
class MuscleSerializer(serializers.ModelSerializer):
@@ -340,14 +334,14 @@ class MuscleSerializer(serializers.ModelSerializer):
340334

341335
class Meta:
342336
model = Muscle
343-
fields = [
337+
fields = (
344338
'id',
345339
'name',
346340
'name_en',
347341
'is_front',
348342
'image_url_main',
349343
'image_url_secondary',
350-
]
344+
)
351345

352346

353347
class ExerciseTranslationBaseInfoSerializer(serializers.ModelSerializer):
@@ -541,7 +535,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
541535
class Meta:
542536
model = Exercise
543537
depth = 1
544-
fields = [
538+
fields = (
545539
'id',
546540
'uuid',
547541
'created',
@@ -560,7 +554,7 @@ class Meta:
560554
'videos',
561555
'author_history',
562556
'total_authors_history',
563-
]
557+
)
564558

565559
def to_representation(self, instance):
566560
"""
@@ -627,7 +621,7 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
627621
)
628622

629623
class Meta:
630-
fields = [
624+
fields = (
631625
'id',
632626
'category',
633627
'muscles',
@@ -638,7 +632,7 @@ class Meta:
638632
'license',
639633
'license_author',
640634
'translations',
641-
]
635+
)
642636
model = Exercise
643637

644638
def validate(self, data):

0 commit comments

Comments
 (0)