Skip to content

Commit f96e236

Browse files
authored
Merge pull request #953 from PokeAPI/format-newblack-serializer
2 parents 3fa2b69 + 8ba6f94 commit f96e236

18 files changed

+7
-592
lines changed

pokemon_v2/api.py

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -71,336 +71,288 @@ class PokeapiCommonViewset(
7171

7272

7373
class AbilityResource(PokeapiCommonViewset):
74-
7574
queryset = Ability.objects.all()
7675
serializer_class = AbilityDetailSerializer
7776
list_serializer_class = AbilitySummarySerializer
7877

7978

8079
class BerryResource(PokeapiCommonViewset):
81-
8280
queryset = Berry.objects.all()
8381
serializer_class = BerryDetailSerializer
8482
list_serializer_class = BerrySummarySerializer
8583

8684

8785
class BerryFirmnessResource(PokeapiCommonViewset):
88-
8986
queryset = BerryFirmness.objects.all()
9087
serializer_class = BerryFirmnessDetailSerializer
9188
list_serializer_class = BerryFirmnessSummarySerializer
9289

9390

9491
class BerryFlavorResource(PokeapiCommonViewset):
95-
9692
queryset = BerryFlavor.objects.all()
9793
serializer_class = BerryFlavorDetailSerializer
9894
list_serializer_class = BerryFlavorSummarySerializer
9995

10096

10197
class CharacteristicResource(PokeapiCommonViewset):
102-
10398
queryset = Characteristic.objects.all()
10499
serializer_class = CharacteristicDetailSerializer
105100
list_serializer_class = CharacteristicSummarySerializer
106101

107102

108103
class ContestEffectResource(PokeapiCommonViewset):
109-
110104
queryset = ContestEffect.objects.all()
111105
serializer_class = ContestEffectDetailSerializer
112106
list_serializer_class = ContestEffectSummarySerializer
113107

114108

115109
class ContestTypeResource(PokeapiCommonViewset):
116-
117110
queryset = ContestType.objects.all()
118111
serializer_class = ContestTypeDetailSerializer
119112
list_serializer_class = ContestTypeSummarySerializer
120113

121114

122115
class EggGroupResource(PokeapiCommonViewset):
123-
124116
queryset = EggGroup.objects.all()
125117
serializer_class = EggGroupDetailSerializer
126118
list_serializer_class = EggGroupSummarySerializer
127119

128120

129121
class EncounterConditionResource(PokeapiCommonViewset):
130-
131122
queryset = EncounterCondition.objects.all()
132123
serializer_class = EncounterConditionDetailSerializer
133124
list_serializer_class = EncounterConditionSummarySerializer
134125

135126

136127
class EncounterConditionValueResource(PokeapiCommonViewset):
137-
138128
queryset = EncounterConditionValue.objects.all()
139129
serializer_class = EncounterConditionValueDetailSerializer
140130
list_serializer_class = EncounterConditionValueSummarySerializer
141131

142132

143133
class EncounterMethodResource(PokeapiCommonViewset):
144-
145134
queryset = EncounterMethod.objects.all()
146135
serializer_class = EncounterMethodDetailSerializer
147136
list_serializer_class = EncounterMethodSummarySerializer
148137

149138

150139
class EvolutionChainResource(PokeapiCommonViewset):
151-
152140
queryset = EvolutionChain.objects.all()
153141
serializer_class = EvolutionChainDetailSerializer
154142
list_serializer_class = EvolutionChainSummarySerializer
155143

156144

157145
class EvolutionTriggerResource(PokeapiCommonViewset):
158-
159146
queryset = EvolutionTrigger.objects.all()
160147
serializer_class = EvolutionTriggerDetailSerializer
161148
list_serializer_class = EvolutionTriggerSummarySerializer
162149

163150

164151
class GenerationResource(PokeapiCommonViewset):
165-
166152
queryset = Generation.objects.all()
167153
serializer_class = GenerationDetailSerializer
168154
list_serializer_class = GenerationSummarySerializer
169155

170156

171157
class GenderResource(PokeapiCommonViewset):
172-
173158
queryset = Gender.objects.all()
174159
serializer_class = GenderDetailSerializer
175160
list_serializer_class = GenderSummarySerializer
176161

177162

178163
class GrowthRateResource(PokeapiCommonViewset):
179-
180164
queryset = GrowthRate.objects.all()
181165
serializer_class = GrowthRateDetailSerializer
182166
list_serializer_class = GrowthRateSummarySerializer
183167

184168

185169
class ItemResource(PokeapiCommonViewset):
186-
187170
queryset = Item.objects.all()
188171
serializer_class = ItemDetailSerializer
189172
list_serializer_class = ItemSummarySerializer
190173

191174

192175
class ItemCategoryResource(PokeapiCommonViewset):
193-
194176
queryset = ItemCategory.objects.all()
195177
serializer_class = ItemCategoryDetailSerializer
196178
list_serializer_class = ItemCategorySummarySerializer
197179

198180

199181
class ItemAttributeResource(PokeapiCommonViewset):
200-
201182
queryset = ItemAttribute.objects.all()
202183
serializer_class = ItemAttributeDetailSerializer
203184
list_serializer_class = ItemAttributeSummarySerializer
204185

205186

206187
class ItemFlingEffectResource(PokeapiCommonViewset):
207-
208188
queryset = ItemFlingEffect.objects.all()
209189
serializer_class = ItemFlingEffectDetailSerializer
210190
list_serializer_class = ItemFlingEffectSummarySerializer
211191

212192

213193
class ItemPocketResource(PokeapiCommonViewset):
214-
215194
queryset = ItemPocket.objects.all()
216195
serializer_class = ItemPocketDetailSerializer
217196
list_serializer_class = ItemPocketSummarySerializer
218197

219198

220199
class LanguageResource(PokeapiCommonViewset):
221-
222200
queryset = Language.objects.all()
223201
serializer_class = LanguageDetailSerializer
224202
list_serializer_class = LanguageSummarySerializer
225203

226204

227205
class LocationResource(PokeapiCommonViewset):
228-
229206
queryset = Location.objects.all()
230207
serializer_class = LocationDetailSerializer
231208
list_serializer_class = LocationSummarySerializer
232209

233210

234211
class LocationAreaResource(ListOrDetailSerialRelation, viewsets.ReadOnlyModelViewSet):
235-
236212
queryset = LocationArea.objects.all()
237213
serializer_class = LocationAreaDetailSerializer
238214
list_serializer_class = LocationAreaSummarySerializer
239215

240216

241217
class MachineResource(PokeapiCommonViewset):
242-
243218
queryset = Machine.objects.all()
244219
serializer_class = MachineDetailSerializer
245220
list_serializer_class = MachineSummarySerializer
246221

247222

248223
class MoveResource(PokeapiCommonViewset):
249-
250224
queryset = Move.objects.all()
251225
serializer_class = MoveDetailSerializer
252226
list_serializer_class = MoveSummarySerializer
253227

254228

255229
class MoveDamageClassResource(PokeapiCommonViewset):
256-
257230
queryset = MoveDamageClass.objects.all()
258231
serializer_class = MoveDamageClassDetailSerializer
259232
list_serializer_class = MoveDamageClassSummarySerializer
260233

261234

262235
class MoveMetaAilmentResource(PokeapiCommonViewset):
263-
264236
queryset = MoveMetaAilment.objects.all()
265237
serializer_class = MoveMetaAilmentDetailSerializer
266238
list_serializer_class = MoveMetaAilmentSummarySerializer
267239

268240

269241
class MoveBattleStyleResource(PokeapiCommonViewset):
270-
271242
queryset = MoveBattleStyle.objects.all()
272243
serializer_class = MoveBattleStyleDetailSerializer
273244
list_serializer_class = MoveBattleStyleSummarySerializer
274245

275246

276247
class MoveMetaCategoryResource(PokeapiCommonViewset):
277-
278248
queryset = MoveMetaCategory.objects.all()
279249
serializer_class = MoveMetaCategoryDetailSerializer
280250
list_serializer_class = MoveMetaCategorySummarySerializer
281251

282252

283253
class MoveLearnMethodResource(PokeapiCommonViewset):
284-
285254
queryset = MoveLearnMethod.objects.all()
286255
serializer_class = MoveLearnMethodDetailSerializer
287256
list_serializer_class = MoveLearnMethodSummarySerializer
288257

289258

290259
class MoveTargetResource(PokeapiCommonViewset):
291-
292260
queryset = MoveTarget.objects.all()
293261
serializer_class = MoveTargetDetailSerializer
294262
list_serializer_class = MoveTargetSummarySerializer
295263

296264

297265
class NatureResource(PokeapiCommonViewset):
298-
299266
queryset = Nature.objects.all()
300267
serializer_class = NatureDetailSerializer
301268
list_serializer_class = NatureSummarySerializer
302269

303270

304271
class PalParkAreaResource(PokeapiCommonViewset):
305-
306272
queryset = PalParkArea.objects.all()
307273
serializer_class = PalParkAreaDetailSerializer
308274
list_serializer_class = PalParkAreaSummarySerializer
309275

310276

311277
class PokeathlonStatResource(PokeapiCommonViewset):
312-
313278
queryset = PokeathlonStat.objects.all()
314279
serializer_class = PokeathlonStatDetailSerializer
315280
list_serializer_class = PokeathlonStatSummarySerializer
316281

317282

318283
class PokedexResource(PokeapiCommonViewset):
319-
320284
queryset = Pokedex.objects.all()
321285
serializer_class = PokedexDetailSerializer
322286
list_serializer_class = PokedexSummarySerializer
323287

324288

325289
class PokemonColorResource(PokeapiCommonViewset):
326-
327290
queryset = PokemonColor.objects.all()
328291
serializer_class = PokemonColorDetailSerializer
329292
list_serializer_class = PokemonColorSummarySerializer
330293

331294

332295
class PokemonFormResource(PokeapiCommonViewset):
333-
334296
queryset = PokemonForm.objects.all()
335297
serializer_class = PokemonFormDetailSerializer
336298
list_serializer_class = PokemonFormSummarySerializer
337299

338300

339301
class PokemonHabitatResource(PokeapiCommonViewset):
340-
341302
queryset = PokemonHabitat.objects.all()
342303
serializer_class = PokemonHabitatDetailSerializer
343304
list_serializer_class = PokemonHabitatSummarySerializer
344305

345306

346307
class PokemonShapeResource(PokeapiCommonViewset):
347-
348308
queryset = PokemonShape.objects.all()
349309
serializer_class = PokemonShapeDetailSerializer
350310
list_serializer_class = PokemonShapeSummarySerializer
351311

352312

353313
class PokemonResource(PokeapiCommonViewset):
354-
355314
queryset = Pokemon.objects.all()
356315
serializer_class = PokemonDetailSerializer
357316
list_serializer_class = PokemonSummarySerializer
358317

359318

360319
class PokemonSpeciesResource(PokeapiCommonViewset):
361-
362320
queryset = PokemonSpecies.objects.all().order_by("id")
363321
serializer_class = PokemonSpeciesDetailSerializer
364322
list_serializer_class = PokemonSpeciesSummarySerializer
365323

366324

367325
class RegionResource(PokeapiCommonViewset):
368-
369326
queryset = Region.objects.all()
370327
serializer_class = RegionDetailSerializer
371328
list_serializer_class = RegionSummarySerializer
372329

373330

374331
class StatResource(PokeapiCommonViewset):
375-
376332
queryset = Stat.objects.all()
377333
serializer_class = StatDetailSerializer
378334
list_serializer_class = StatSummarySerializer
379335

380336

381337
class SuperContestEffectResource(PokeapiCommonViewset):
382-
383338
queryset = SuperContestEffect.objects.all()
384339
serializer_class = SuperContestEffectDetailSerializer
385340
list_serializer_class = SuperContestEffectSummarySerializer
386341

387342

388343
class TypeResource(PokeapiCommonViewset):
389-
390344
queryset = Type.objects.all()
391345
serializer_class = TypeDetailSerializer
392346
list_serializer_class = TypeSummarySerializer
393347

394348

395349
class VersionResource(PokeapiCommonViewset):
396-
397350
queryset = Version.objects.all()
398351
serializer_class = VersionDetailSerializer
399352
list_serializer_class = VersionSummarySerializer
400353

401354

402355
class VersionGroupResource(PokeapiCommonViewset):
403-
404356
queryset = VersionGroup.objects.all()
405357
serializer_class = VersionGroupDetailSerializer
406358
list_serializer_class = VersionGroupSummarySerializer
@@ -412,7 +364,6 @@ class PokemonEncounterView(APIView):
412364
"""
413365

414366
def get(self, request, pokemon_id):
415-
416367
self.context = dict(request=request)
417368

418369
try:
@@ -434,7 +385,6 @@ def get(self, request, pokemon_id):
434385
encounters_list = []
435386

436387
for area_id in area_ids:
437-
438388
location_area = location_area_objects.get(pk=area_id)
439389

440390
area_encounters = encounter_objects.filter(location_area_id=area_id)
@@ -448,7 +398,6 @@ def get(self, request, pokemon_id):
448398
version_details_list = []
449399

450400
for version_id in version_ids:
451-
452401
version = version_objects.get(pk=version_id)
453402

454403
version_encounters = area_encounters.filter(

pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class Migration(migrations.Migration):
5-
65
# replaces = [(b'pokemon_v2', '0001_squashed_0006_pokemonformsprites'), (b'pokemon_v2', '0002_auto_20160301_1408')]
76

87
# dependencies = [

pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class Migration(migrations.Migration):
5-
65
dependencies = [
76
("pokemon_v2", "0001_squashed_0002_auto_20160301_1408"),
87
]

pokemon_v2/migrations/0003_auto_20160530_1132.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class Migration(migrations.Migration):
5-
65
dependencies = [
76
("pokemon_v2", "0002_itemsprites_pokemonformsprites_pokemonsprites"),
87
]

pokemon_v2/migrations/0004_iso639length_20191217.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
class Migration(migrations.Migration):
5-
65
dependencies = [
76
("pokemon_v2", "0003_auto_20160530_1132"),
87
]

0 commit comments

Comments
 (0)