Swap over to Aeon

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "proto"]
 	path = proto
-	url = https://github.com/rubenvereecken/protocol.git
+	url = https://github.com/AeonLucid/POGOProtos 

compile.sh

@@ -2,5 +2,8 @@
 
 mkdir -p pogo/proto
 rm -rf pogo/proto/*
-protoc --proto_path=proto --python_out=pogo/proto `find proto -name "*proto"`
-touch pogo/proto/__init__.py
+cd ./proto/
+./compile.py -l python -o ../pogo/proto
+cd ../
+find ./pogo/proto/ -type d -exec touch {}/__init__.py \;
+echo "'Generated'; import os; import sys; sys.path.append(os.path.dirname(os.path.realpath(__file__)))" > ./pogo/proto/__init__.py

pogo/api.py

@@ -6,8 +6,6 @@
 import random
 import logging
 
-from proto import request_pb2
-
 from session import PogoSession
 import location
 
@@ -83,8 +81,7 @@ def createPTCSession(username, pw, startLocation):
     try:
         ticket = re.sub('.*ticket=', '', authResponse.history[0].headers['Location'])
     except Exception as e:
-        if DEBUG:
-            print(authResponse.json()['errors'][0])
+        logging.error(authResponse.json()['errors'][0])
         return None
 
     data1 = {
@@ -99,3 +96,5 @@ def createPTCSession(username, pw, startLocation):
     access_token = re.sub('.*access_token=', '', access_token)
 
     return createPogoSession(session, 'ptc', access_token, startLocation)
+
+

pogo/demo.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python
 import argparse
 import logging
 import sys
@@ -11,7 +12,7 @@ def setupLogger():
     logger.setLevel(logging.INFO)
     ch = logging.StreamHandler()
     ch.setLevel(logging.DEBUG)
-    formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+    formatter = logging.Formatter('Line %(lineno)d,%(filename)s  - %(asctime)s - %(levelname)s - %(message)s')
     ch.setFormatter(formatter)
     logger.addHandler(ch)
 
@@ -26,9 +27,7 @@ def setupLogger():
     parser.add_argument("-u", "--username", help="Username", required=True)
     parser.add_argument("-p", "--password", help="Password", required=True)
     parser.add_argument("-l", "--location", help="Location", required=True)
-    # parser.add_argument("-d", "--debug", help="Debug Mode", action='store_true')
     parser.add_argument("-s", "--client_secret", help="PTC Client Secret")
-    # parser.set_defaults(DEBUG=True)
     args = parser.parse_args()
 
     if args.auth not in ['ptc', 'google']: