From 8832c819e38057ba8b024955e517750f5191d5c1 Mon Sep 17 00:00:00 2001 From: Charles Marttinen Date: Thu, 18 Oct 2018 19:28:47 -0400 Subject: [PATCH] chore: Remove python2 compatibility code --- config/urls.py | 3 - data/v2/build.py | 3 - pokemon_v2/admin.py | 168 ------------------ pokemon_v2/api.py | 5 +- .../0001_squashed_0002_auto_20160301_1408.py | 3 - ...rites_pokemonformsprites_pokemonsprites.py | 3 - .../migrations/0003_auto_20160530_1132.py | 3 - pokemon_v2/models.py | 1 - pokemon_v2/serializers.py | 2 - pokemon_v2/test_models.py | 1 - pokemon_v2/tests.py | 1 - pokemon_v2/urls.py | 3 - 12 files changed, 2 insertions(+), 194 deletions(-) delete mode 100755 pokemon_v2/admin.py diff --git a/config/urls.py b/config/urls.py index ab9f7150..20f29fae 100755 --- a/config/urls.py +++ b/config/urls.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf.urls import include, url from pokemon_v2 import urls as pokemon_v2_urls diff --git a/data/v2/build.py b/data/v2/build.py index 82cacef2..3d06f0d8 100644 --- a/data/v2/build.py +++ b/data/v2/build.py @@ -11,9 +11,6 @@ # wipe it and rewrite each row using the data found in data/v2/csv. -# support python3 -from __future__ import print_function - import csv import os import os.path diff --git a/pokemon_v2/admin.py b/pokemon_v2/admin.py deleted file mode 100755 index 1f84e9f3..00000000 --- a/pokemon_v2/admin.py +++ /dev/null @@ -1,168 +0,0 @@ -from __future__ import unicode_literals -from django.contrib import admin - -from .models import * # NOQA - -admin.site.register(Ability) -admin.site.register(AbilityName) -admin.site.register(AbilityEffectText) -admin.site.register(AbilityFlavorText) -admin.site.register(AbilityChange) -admin.site.register(AbilityChangeEffectText) - -admin.site.register(Berry) -admin.site.register(BerryFirmness) -admin.site.register(BerryFirmnessName) -admin.site.register(BerryFlavor) - -admin.site.register(Characteristic) -admin.site.register(CharacteristicDescription) - -admin.site.register(ContestCombo) -admin.site.register(ContestEffectEffectText) -admin.site.register(ContestEffectFlavorText) -admin.site.register(ContestEffect) -admin.site.register(ContestType) -admin.site.register(ContestTypeName) - -admin.site.register(EggGroup) -admin.site.register(EggGroupName) - -admin.site.register(EncounterCondition) -admin.site.register(EncounterConditionValue) -admin.site.register(EncounterConditionName) -admin.site.register(EncounterConditionValueName) -admin.site.register(EncounterConditionValueMap) -admin.site.register(EncounterMethod) -admin.site.register(EncounterMethodName) -admin.site.register(EncounterSlot) -admin.site.register(Encounter) - -admin.site.register(EvolutionChain) -admin.site.register(EvolutionTrigger) -admin.site.register(EvolutionTriggerName) - -admin.site.register(Experience) - -admin.site.register(Gender) - -admin.site.register(Generation) -admin.site.register(GenerationName) - -admin.site.register(GrowthRate) -admin.site.register(GrowthRateDescription) - -admin.site.register(ItemCategory) -admin.site.register(ItemCategoryName) -admin.site.register(ItemAttribute) -admin.site.register(ItemAttributeMap) -admin.site.register(ItemAttributeDescription) -admin.site.register(ItemFlavorText) -admin.site.register(ItemFlingEffect) -admin.site.register(ItemFlingEffectEffectText) -admin.site.register(ItemGameIndex) -admin.site.register(ItemName) -admin.site.register(ItemPocketName) -admin.site.register(ItemPocket) -admin.site.register(ItemEffectText) -admin.site.register(Item) - -admin.site.register(Language) -admin.site.register(LanguageName) - -admin.site.register(LocationAreaEncounterRate) -admin.site.register(LocationAreaName) -admin.site.register(LocationArea) -admin.site.register(LocationGameIndex) -admin.site.register(LocationName) -admin.site.register(Location) - -admin.site.register(Machine) - -admin.site.register(MoveBattleStyle) -admin.site.register(MoveBattleStyleName) -admin.site.register(MoveChange) -admin.site.register(MoveDamageClass) -admin.site.register(MoveDamageClassDescription) -admin.site.register(MoveEffectChange) -admin.site.register(MoveEffectChangeEffectText) -admin.site.register(MoveEffectEffectText) -admin.site.register(MoveEffect) -admin.site.register(MoveAttributeDescription) -admin.site.register(MoveAttributeMap) -admin.site.register(MoveAttributeName) -admin.site.register(MoveAttribute) -admin.site.register(MoveFlavorText) -admin.site.register(MoveLearnMethod) -admin.site.register(MoveLearnMethodName) -admin.site.register(MoveMeta) -admin.site.register(MoveMetaAilment) -admin.site.register(MoveMetaAilmentName) -admin.site.register(MoveMetaCategoryDescription) -admin.site.register(MoveMetaCategory) -admin.site.register(MoveMetaStatChange) -admin.site.register(MoveName) -admin.site.register(MoveTargetDescription) -admin.site.register(MoveTarget) -admin.site.register(Move) - -admin.site.register(NatureBattleStylePreference) -admin.site.register(NatureName) -admin.site.register(NaturePokeathlonStat) -admin.site.register(Nature) - -admin.site.register(PalParkArea) -admin.site.register(PalParkAreaName) -admin.site.register(PalPark) - -admin.site.register(PokeathlonStatName) -admin.site.register(PokeathlonStat) - -admin.site.register(Pokedex) -admin.site.register(PokedexVersionGroup) -admin.site.register(PokedexDescription) - -admin.site.register(Pokemon) -admin.site.register(PokemonAbility) -admin.site.register(PokemonColor) -admin.site.register(PokemonColorName) -admin.site.register(PokemonDexNumber) -admin.site.register(PokemonEggGroup) -admin.site.register(PokemonEvolution) -admin.site.register(PokemonForm) -admin.site.register(PokemonFormName) -admin.site.register(PokemonFormGeneration) -admin.site.register(PokemonGameIndex) -admin.site.register(PokemonHabitat) -admin.site.register(PokemonHabitatName) -admin.site.register(PokemonItem) -admin.site.register(PokemonMove) -admin.site.register(PokemonShape) -admin.site.register(PokemonShapeName) -admin.site.register(PokemonSpecies) -admin.site.register(PokemonSpeciesName) -admin.site.register(PokemonSpeciesDescription) -admin.site.register(PokemonSpeciesFlavorText) -admin.site.register(PokemonStat) -admin.site.register(PokemonType) - -admin.site.register(Region) -admin.site.register(RegionName) - -admin.site.register(StatName) -admin.site.register(Stat) - -admin.site.register(SuperContestEffect) -admin.site.register(SuperContestCombo) -admin.site.register(SuperContestEffectFlavorText) - -admin.site.register(Type) -admin.site.register(TypeName) -admin.site.register(TypeGameIndex) -admin.site.register(TypeEfficacy) - -admin.site.register(Version) -admin.site.register(VersionName) -admin.site.register(VersionGroup) -admin.site.register(VersionGroupMoveLearnMethod) -admin.site.register(VersionGroupRegion) diff --git a/pokemon_v2/api.py b/pokemon_v2/api.py index 261189ee..e63727b5 100644 --- a/pokemon_v2/api.py +++ b/pokemon_v2/api.py @@ -1,13 +1,12 @@ - -from __future__ import unicode_literals from rest_framework import viewsets from rest_framework.response import Response from rest_framework.views import APIView from django.shortcuts import get_object_or_404 from django.http import Http404 +import re + from .models import * # NOQA from .serializers import * # NOQA -import re ########################### diff --git a/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py b/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py index 0f92ca1c..888114f6 100644 --- a/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py +++ b/pokemon_v2/migrations/0001_squashed_0002_auto_20160301_1408.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py b/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py index 380a249a..5a527808 100644 --- a/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py +++ b/pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/pokemon_v2/migrations/0003_auto_20160530_1132.py b/pokemon_v2/migrations/0003_auto_20160530_1132.py index 27f58538..27ebe186 100644 --- a/pokemon_v2/migrations/0003_auto_20160530_1132.py +++ b/pokemon_v2/migrations/0003_auto_20160530_1132.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/pokemon_v2/models.py b/pokemon_v2/models.py index beb011a1..3333bae2 100755 --- a/pokemon_v2/models.py +++ b/pokemon_v2/models.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.db import models ##################### diff --git a/pokemon_v2/serializers.py b/pokemon_v2/serializers.py index 21755b2e..eec174cf 100644 --- a/pokemon_v2/serializers.py +++ b/pokemon_v2/serializers.py @@ -1,5 +1,3 @@ - -from __future__ import unicode_literals from django.urls import reverse from rest_framework import serializers from collections import OrderedDict diff --git a/pokemon_v2/test_models.py b/pokemon_v2/test_models.py index 384c17e8..674b85b2 100644 --- a/pokemon_v2/test_models.py +++ b/pokemon_v2/test_models.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.test import TestCase from pokemon_v2.models import * # NOQA diff --git a/pokemon_v2/tests.py b/pokemon_v2/tests.py index 2c33f793..957f47fd 100644 --- a/pokemon_v2/tests.py +++ b/pokemon_v2/tests.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from rest_framework import status from rest_framework.test import APITestCase from pokemon_v2.models import * # NOQA diff --git a/pokemon_v2/urls.py b/pokemon_v2/urls.py index d3ce585f..4116881f 100644 --- a/pokemon_v2/urls.py +++ b/pokemon_v2/urls.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf.urls import include, url #####################################