Revert "Python 3 Compatibility"

.gitignore

@@ -23,8 +23,6 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
-*.orig
-*.bak
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

README.md

@@ -96,7 +96,6 @@ If you do not want any data to be gathered, you can turn off this feature by set
  * mzupan
  * gnekic(GeXx)
  * Shoh
- * JSchwerberg
  * luizperes
  * brantje
  * VirtualSatai

pokecli.py

@@ -31,7 +31,6 @@
 import json
 import logging
 import os
-import six
 import ssl
 import sys
 import time
@@ -165,9 +164,8 @@ def get_commit_hash():
             return f.read()[:8]
 
     try:
-        if six.PY2:
-            sys.stdout = codecs.getwriter('utf8')(sys.stdout)
-            sys.stderr = codecs.getwriter('utf8')(sys.stderr)
+        sys.stdout = codecs.getwriter('utf8')(sys.stdout)
+        sys.stderr = codecs.getwriter('utf8')(sys.stderr)
 
         logger.info('PokemonGO Bot v1.0')
         logger.info('commit: ' + get_commit_hash())

pokemongo_bot/__init__.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from __future__ import absolute_import
 
 import datetime
 import json
@@ -20,28 +19,27 @@
 from pgoapi.utilities import f2i, get_cell_ids
 from s2sphere import Cell, CellId, LatLng
 
-from . import cell_workers
-from .base_task import BaseTask
-from .plugin_loader import PluginLoader
-from .api_wrapper import ApiWrapper
-from .cell_workers.utils import distance
-from .event_manager import EventManager
-from .human_behaviour import sleep
-from .item_list import Item
-from .metrics import Metrics
-from .sleep_schedule import SleepSchedule
+import cell_workers
+from base_task import BaseTask
+from plugin_loader import PluginLoader
+from api_wrapper import ApiWrapper
+from cell_workers.utils import distance
+from event_manager import EventManager
+from human_behaviour import sleep
+from item_list import Item
+from metrics import Metrics
+from sleep_schedule import SleepSchedule
 from pokemongo_bot.event_handlers import SocketIoHandler, LoggingHandler, SocialHandler
 from pokemongo_bot.socketio_server.runner import SocketIoRunner
 from pokemongo_bot.websocket_remote_control import WebsocketRemoteControl
 from pokemongo_bot.base_dir import _base_dir
-from .worker_result import WorkerResult
-from .tree_config_builder import ConfigException
-from .tree_config_builder import MismatchTaskApiVersion
-from .tree_config_builder import TreeConfigBuilder
-from .inventory import init_inventory, player
+from worker_result import WorkerResult
+from tree_config_builder import ConfigException, MismatchTaskApiVersion, TreeConfigBuilder
+from inventory import init_inventory, player
 from sys import platform as _platform
 from pgoapi.protos.POGOProtos.Enums import BadgeType_pb2
 from pgoapi.exceptions import AuthException
+import struct
 
 
 class FileIOException(Exception):
@@ -1319,7 +1317,7 @@ def heartbeat(self):
                 # store awarded_badges reponse to be used in a task or part of heartbeat
                 self._awarded_badges = responses['responses']['CHECK_AWARDED_BADGES']
 
-            if 'awarded_badges' in self._awarded_badges:
+            if self._awarded_badges.has_key('awarded_badges'):
                 i = 0
                 for badge in self._awarded_badges['awarded_badges']:
                     badgelevel = self._awarded_badges['awarded_badge_levels'][i]
@@ -1409,6 +1407,7 @@ def _load_recent_forts(self):
                     cached_recent_forts = json.load(f)
             except (IOError, ValueError) as e:
                 self.logger.info('[x] Error while opening cached forts: %s' % e)
+                pass
             except:
                 raise FileIOException("Unexpected error opening {}".cached_forts_path)
 

pokemongo_bot/api_wrapper.py

@@ -1,19 +1,17 @@
-from __future__ import absolute_import
 import time
 import logging
 import random, base64, struct
 import hashlib
 import os
+import json
 from pgoapi.exceptions import (ServerSideRequestThrottlingException,
                                NotLoggedInException, ServerBusyOrOfflineException,
                                NoPlayerPositionSetException, EmptySubrequestChainException,
                                UnexpectedResponseException)
-from pgoapi.pgoapi import PGoApi
-from pgoapi.pgoapi import PGoApiRequest
-from pgoapi.pgoapi import RpcApi
+from pgoapi.pgoapi import PGoApi, PGoApiRequest, RpcApi
 from pgoapi.protos.POGOProtos.Networking.Requests.RequestType_pb2 import RequestType
 from pgoapi.utilities import get_time
-from .human_behaviour import sleep, gps_noise_rng
+from human_behaviour import sleep, gps_noise_rng
 from pokemongo_bot.base_dir import _base_dir
 
 

pokemongo_bot/cell_workers/__init__.py

@@ -1,31 +1,30 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
-from .evolve_pokemon import EvolvePokemon
-from .incubate_eggs import IncubateEggs
-from .move_to_fort import MoveToFort
-from .move_to_map_pokemon import MoveToMapPokemon
-from .nickname_pokemon import NicknamePokemon
-from .pokemon_catch_worker import PokemonCatchWorker
-from .pokemon_hunter import PokemonHunter
-from .pokemon_optimizer import PokemonOptimizer
-from .transfer_pokemon import TransferPokemon
-from .recycle_items import RecycleItems
-from .spin_fort import SpinFort
-from .handle_soft_ban import HandleSoftBan
-from .follow_path import FollowPath
-from .follow_spiral import FollowSpiral
-from .collect_level_up_reward import CollectLevelUpReward
-from .follow_cluster import FollowCluster
-from .update_live_stats import UpdateLiveStats
-from .update_live_inventory import UpdateLiveInventory
-from .catch_pokemon import CatchPokemon
-from .complete_tutorial import CompleteTutorial
-from .random_pause import RandomPause
-from .update_web_inventory import UpdateWebInventory
-from .random_alive_pause import RandomAlivePause
-from .show_best_pokemon import ShowBestPokemon
-from .telegram_task import TelegramTask
-from .use_incense import UseIncense
-from .camp_fort import CampFort
-from .discord_task import DiscordTask
+from evolve_pokemon import EvolvePokemon
+from incubate_eggs import IncubateEggs
+from move_to_fort import MoveToFort
+from move_to_map_pokemon import MoveToMapPokemon
+from nickname_pokemon import NicknamePokemon
+from pokemon_catch_worker import PokemonCatchWorker
+from pokemon_hunter import PokemonHunter
+from pokemon_optimizer import PokemonOptimizer
+from transfer_pokemon import TransferPokemon
+from recycle_items import RecycleItems
+from spin_fort import SpinFort
+from handle_soft_ban import HandleSoftBan
+from follow_path import FollowPath
+from follow_spiral import FollowSpiral
+from collect_level_up_reward import CollectLevelUpReward
+from follow_cluster import FollowCluster
+from update_live_stats import UpdateLiveStats
+from update_live_inventory import UpdateLiveInventory
+from catch_pokemon import CatchPokemon
+from complete_tutorial import CompleteTutorial
+from random_pause import RandomPause
+from update_web_inventory import UpdateWebInventory
+from random_alive_pause import RandomAlivePause
+from show_best_pokemon import ShowBestPokemon
+from telegram_task import TelegramTask
+from use_incense import UseIncense
+from camp_fort import CampFort
+from discord_task import DiscordTask

pokemongo_bot/cell_workers/catch_pokemon.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from __future__ import absolute_import
 
 import json
 import os
@@ -11,7 +10,7 @@
 from pokemongo_bot.worker_result import WorkerResult
 from pokemongo_bot.item_list import Item
 from pokemongo_bot import inventory
-from .utils import fort_details, distance,  format_time
+from utils import fort_details, distance,  format_time
 from pokemongo_bot.base_dir import _base_dir
 from pokemongo_bot.constants import Constants
 from pokemongo_bot.inventory import Pokemons

pokemongo_bot/cell_workers/evolve_pokemon.py

@@ -1,3 +1,4 @@
+from random import uniform
 
 from pokemongo_bot import inventory
 from pokemongo_bot.human_behaviour import sleep, action_delay

pokemongo_bot/cell_workers/follow_cluster.py

@@ -2,6 +2,7 @@
 from pokemongo_bot.cell_workers.utils import distance
 from pokemongo_bot.cell_workers.utils import find_biggest_cluster
 from pokemongo_bot.base_task import BaseTask
+from random import uniform
 
 class FollowCluster(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1

pokemongo_bot/cell_workers/follow_path.py

@@ -1,20 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
 import gpxpy
 import gpxpy.gpx
 import json
 import time
 from pokemongo_bot.base_task import BaseTask
-from pokemongo_bot.cell_workers.utils import distance
-from pokemongo_bot.cell_workers.utils import format_dist
-from pokemongo_bot.cell_workers.utils import i2f
+from pokemongo_bot.cell_workers.utils import distance, i2f, format_dist
 from pokemongo_bot.human_behaviour import sleep
 from pokemongo_bot.walkers.walker_factory import walker_factory
 from pokemongo_bot.worker_result import WorkerResult
 from pgoapi.utilities import f2i
 from random import uniform
-from .utils import getSeconds, format_dist
+from utils import getSeconds, format_dist
 from datetime import datetime as dt, timedelta
 
 STATUS_MOVING = 0

pokemongo_bot/cell_workers/follow_spiral.py

@@ -64,7 +64,7 @@ def _generate_spiral(starting_lat, starting_lng, step_size, step_limit):
 
     def work(self):
         if not self.next_point:
-            self.next_point = next(self.points)
+            self.next_point = self.points.next()
         point = self.next_point
         step_walker = StepWalker(self.bot, point['lat'], point['lng'])
         if step_walker.step():

pokemongo_bot/cell_workers/incubate_eggs.py

@@ -4,7 +4,6 @@
 from pokemongo_bot.human_behaviour import sleep
 from pokemongo_bot.base_task import BaseTask
 from pokemongo_bot.worker_result import WorkerResult
-from functools import reduce
 
 
 class IncubateEggs(BaseTask):

pokemongo_bot/cell_workers/move_to_fort.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from __future__ import absolute_import
 
 from pokemongo_bot import inventory
 from pokemongo_bot.constants import Constants
 from pokemongo_bot.walkers.walker_factory import walker_factory
 from pokemongo_bot.worker_result import WorkerResult
 from pokemongo_bot.base_task import BaseTask
-from .utils import distance, format_dist, fort_details
+from utils import distance, format_dist, fort_details
 from datetime import datetime, timedelta
 
 

pokemongo_bot/cell_workers/nickname_pokemon.py

@@ -5,9 +5,7 @@
 import json
 from pokemongo_bot.base_task import BaseTask
 from pokemongo_bot.human_behaviour import sleep, action_delay
-from pokemongo_bot.inventory import Attack
-from pokemongo_bot.inventory import Pokemon
-from pokemongo_bot.inventory import pokemons
+from pokemongo_bot.inventory import pokemons, Pokemon, Attack
 
 import re
 

pokemongo_bot/cell_workers/pokemon_catch_worker.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
 import os
 import time
 import json
+import logging
 import sys
 
 from random import random, randrange, uniform
@@ -14,7 +14,7 @@
 from pokemongo_bot.worker_result import WorkerResult
 from pokemongo_bot.base_dir import _base_dir
 from datetime import datetime, timedelta
-from .utils import getSeconds
+from utils import getSeconds
 
 from pprint import pprint
 

pokemongo_bot/cell_workers/recycle_items.py

@@ -163,22 +163,22 @@ def work(self):
 
             if not (self.max_balls_keep is None):
                 this_worker_result = self.recycle_excess_category_max(self.max_balls_keep, [1,2,3,4])
-                if this_worker_result != WorkerResult.SUCCESS:
+                if this_worker_result <> WorkerResult.SUCCESS:
                     worker_result = this_worker_result
 
             if not (self.max_potions_keep is None):
                 this_worker_result =  self.recycle_excess_category_max(self.max_potions_keep, [101,102,103,104])
-                if this_worker_result != WorkerResult.SUCCESS:
+                if this_worker_result <> WorkerResult.SUCCESS:
                     worker_result = this_worker_result
 
             if not (self.max_berries_keep is None):
                 this_worker_result =  self.recycle_excess_category_max(self.max_berries_keep, [701,702,703,704,705])
-                if this_worker_result != WorkerResult.SUCCESS:
+                if this_worker_result <> WorkerResult.SUCCESS:
                     worker_result = this_worker_result
 
             if not (self.max_revives_keep is None):
                 this_worker_result = self.recycle_excess_category_max(self.max_revives_keep, [201,202])
-                if this_worker_result != WorkerResult.SUCCESS:
+                if this_worker_result <> WorkerResult.SUCCESS:
                     worker_result = this_worker_result
 
             for item_in_inventory in inventory.items().all():

pokemongo_bot/cell_workers/show_best_pokemon.py

@@ -1,3 +1,4 @@
+import ctypes
 from datetime import datetime, timedelta
 
 from pokemongo_bot import inventory

pokemongo_bot/cell_workers/spin_fort.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from __future__ import absolute_import
 
 import sys
 import time
@@ -12,7 +11,7 @@
 from pokemongo_bot.human_behaviour import action_delay
 from pokemongo_bot.worker_result import WorkerResult
 from pokemongo_bot.base_task import BaseTask
-from .utils import distance, format_time, fort_details
+from utils import distance, format_time, fort_details
 
 SPIN_REQUEST_RESULT_SUCCESS = 1
 SPIN_REQUEST_RESULT_OUT_OF_RANGE = 2

pokemongo_bot/cell_workers/telegram_task.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from datetime import datetime
+from datetime import timedelta
+import os
+import json
 import telegram
 from pokemongo_bot.base_task import BaseTask
 from pokemongo_bot.base_dir import _base_dir

pokemongo_bot/cell_workers/transfer_pokemon.py

@@ -1,10 +1,10 @@
+import json
+import os
 
 from pokemongo_bot import inventory
 from pokemongo_bot.human_behaviour import action_delay
 from pokemongo_bot.base_task import BaseTask
-from pokemongo_bot.inventory import Attack
-from pokemongo_bot.inventory import Pokemon
-from pokemongo_bot.inventory import Pokemons
+from pokemongo_bot.inventory import Pokemons, Pokemon, Attack
 from operator import attrgetter
 from random import randrange
 
@@ -154,11 +154,11 @@ def should_release_pokemon(self, pokemon, keep_best_mode=False):
         release_config = self._get_release_config_for(pokemon.name)
 
         if (keep_best_mode
-                and 'never_release' not in release_config
-                and 'always_release' not in release_config
-                and 'release_below_cp' not in release_config
-                and 'release_below_iv' not in release_config
-                and 'release_below_ivcp' not in release_config):
+                and not release_config.has_key('never_release')
+                and not release_config.has_key('always_release')
+                and not release_config.has_key('release_below_cp')
+                and not release_config.has_key('release_below_iv')
+                and not release_config.has_key('release_below_ivcp')):
             return True
 
         cp_iv_logic = release_config.get('logic')

pokemongo_bot/cell_workers/update_live_inventory.py

@@ -1,3 +1,4 @@
+import ctypes
 import logging
 from datetime import datetime, timedelta