Bunch of renaming to bring variables up to speed

service/esi.py

@@ -15,7 +15,6 @@ import datetime
 from eos.enum import Enum
 from eos.saveddata.ssocharacter import SsoCharacter
 import gui.globalEvents as GE
-from service.settings import CRESTSettings
 from service.server import StoppableHTTPServer, AuthHandler
 
 from .esi_security_proxy import EsiSecurityProxy
@@ -77,8 +76,6 @@ class Esi(object):
 
         AFTER_TOKEN_REFRESH.add_receiver(self.tokenUpdate)
 
-        self.settings = CRESTSettings.getInstance()
-
         # these will be set when needed
         self.httpd = None
         self.state = None
@@ -98,10 +95,6 @@ class Esi(object):
         print(kwargs)
         pass
 
-    @property
-    def isTestServer(self):
-        return self.settings.get('server') == Servers.SISI
-
     def delSsoCharacter(self, id):
         char = eos.db.getSsoCharacter(id, config.getClientSecret())
 
@@ -222,7 +215,7 @@ class Esi(object):
             pyfalog.warn("OAUTH state mismatch")
             raise Exception("OAUTH State Mismatch.")
 
-        pyfalog.debug("Handling CREST login with: {0}", message)
+        pyfalog.debug("Handling SSO login with: {0}", message)
 
         auth_response = json.loads(base64.b64decode(message['SSOInfo'][0]))
 

service/network.py

@@ -57,7 +57,7 @@ class Network(object):
     # Request constants - every request must supply this, as it is checked if
     # enabled or not via settings
     ENABLED = 1
-    EVE = 2  # Mostly API, but also covers CREST requests
+    EVE = 2  # Mostly API, but also covers CREST requests. update: might be useless these days, this Network class needs to be reviewed
     PRICES = 4
     UPDATE = 8
 

service/port.py

@@ -474,7 +474,7 @@ class Port(object):
             except ValueError:
                 fitobj.ship = Citadel(sMkt.getItem(ship))
         except:
-            pyfalog.warning("Caught exception in importCrest")
+            pyfalog.warning("Caught exception in importESI")
             return None
 
         items.sort(key=lambda k: k['flag'])

service/server.py

@@ -4,7 +4,6 @@ import socket
 import threading
 from logbook import Logger
 
-from service.settings import CRESTSettings
 pyfalog = Logger(__name__)
 
 # noinspection PyPep8
@@ -83,7 +82,7 @@ class AuthHandler(http.server.BaseHTTPRequestHandler):
             if step2:
                 self.server.callback(parts)
                 pyfalog.info("Successfully logged into EVE.")
-                msg = "If you see this message then it means you should be logged into CREST. You may close this window and return to the application."
+                msg = "If you see this message then it means you should be logged into EVE SSO. You may close this window and return to the application."
             else:
                 # For implicit mode, we have to serve up the page which will take the hash and redirect using a querystring
                 pyfalog.info("Processing response from EVE Online.")