more python3 fixes; fixes j-e-k/poketrainer/jekirl#322 (jekirl#323)

Author: infinitewarp

web.py

@@ -7,15 +7,11 @@
 import re
 from collections import defaultdict
 
-import six
 import zerorpc
 from flask import Flask, flash, jsonify, redirect, render_template, url_for
 
 from pgoapi.poke_utils import pokemon_iv_percentage
 
-if six.PY3:
-    from past.builtins import cmp
-
 app = Flask(__name__, template_folder="templates")
 app.secret_key = ".t\x86\xcb3Lm\x0e\x8c:\x86\xe8FD\x13Z\x08\xe1\x04(\x01s\x9a\xae"
 app.debug = True
@@ -47,7 +43,7 @@ def get_api_rpc(username):
     sock_port = 0
     with open(desc_file) as f:
         data = f.read()
-        data = json.loads(data.encode() if len(data) > 0 else '{}')
+        data = json.loads(data if len(data) > 0 else '{}')
         if username not in data:
             print("There is no bot running with the input username!")
             return None
@@ -66,7 +62,7 @@ def status(username):
         return("There is no bot running with the input username!")
     with open("data_dumps/%s.json" % username) as f:
         data = f.read()
-        data = json.loads(data.encode())
+        data = json.loads(data)
         currency = data['GET_PLAYER']['player_data']['currencies'][1]['amount']
         latlng = c.current_location()
         latlng = "%f,%f" % (latlng[0], latlng[1])
@@ -86,7 +82,7 @@ def status(username):
             if "pokemon_family" in item:
                 filled_family = str(item['pokemon_family']['family_id']).zfill(4)
                 candy[filled_family] += item['pokemon_family'].get("candy", 0)
-        pokemons = sorted(pokemons, lambda x, y: cmp(x["iv"], y["iv"]), reverse=True)
+        pokemons = sorted(pokemons, key=lambda x: x["iv"], reverse=True)
         # add candy back into pokemon json
         for pokemon in pokemons:
             pokemon['candy'] = candy[pokemon['family_id']]