More type hints.

flexible.py

@@ -415,7 +415,7 @@ class CIMPortReport(object):
                     self.defer.callback(self.game.gamedata.ports)
                     self.defer = None
 
-    def game_line(self, line):
+    def game_line(self, line: str):
         if line == "" or line == ": ":
             return
         if line == ": ENDINTERROG":
@@ -1030,7 +1030,7 @@ class ScriptPort(object):
         #     self.deactivate()
         #     return
 
-def color_pct(pct):
+def color_pct(pct: int):
     if pct > 50:
         # green
         return "{0}{1:3}{2}".format( Fore.GREEN, pct, Style.RESET_ALL)
@@ -1039,7 +1039,7 @@ def color_pct(pct):
     else:
         return "{0:3}".format(pct)
 
-def port_pct(port):
+def port_pct(port: dict):
     # Make sure these exist in the port data given.
     if all( x in port for x in ['fuel', 'org', 'equ']):
         return "{0},{1},{2}%".format(
@@ -1049,10 +1049,10 @@ def port_pct(port):
     else:
         return "---,---,---%"
 
-def port_show_part(sector, sector_port):
+def port_show_part(sector: int, sector_port: dict):
     return "{0:5} ({1}) {2}".format(sector, sector_port['port'], port_pct(sector_port))
 
-def port_show(sector, sector_port, warp, warp_port):
+def port_show(sector: int, sector_port: dict, warp: int, warp_port: dict):
     sector_pct = port_pct(sector_port)
     warp_pct = port_pct(warp_port)
     return "{0} -=- {1}".format(

galaxy.py

@@ -17,7 +17,7 @@ CLASSES_PORT = {v: k for k, v in PORT_CLASSES.items()}
 
 
 class GameData(object):
-    def __init__(self, usergame):
+    def __init__(self, usergame: tuple):
         # Construct the GameData storage object
         self.usergame = usergame
         self.warps = {}
@@ -106,7 +106,7 @@ class GameData(object):
                     yield
         log.msg("Loaded {0} {1}/{2}".format(filename, len(self.ports), len(self.warps)))
 
-    def warp_to(self, source, *dest):
+    def warp_to(self, source: int, *dest):
         """ connect sector source to destination. 
         """
         log.msg("Warp {0} to {1}".format(source, dest))
@@ -117,7 +117,7 @@ class GameData(object):
             if d not in self.warps[source]:
                 self.warps[source].add(d)
 
-    def set_port(self, sector, data):
+    def set_port(self, sector: int, data: dict):
         log.msg("Port {0} : {1}".format(sector, data))
         if sector not in self.ports:
             self.ports[sector] = dict()

tcp-proxy.py

@@ -20,7 +20,7 @@ from pprint import pformat
 import yaml
 
 
-def config_load(filename):
+def config_load(filename: str):
     global config
     with open(filename, "r") as fp:
         config = yaml.safe_load(fp)
@@ -49,7 +49,7 @@ version = check_output(
 ).strip()
 
 
-def merge(color_string):
+def merge(color_string: str):
     """ Given a string of colorama ANSI, merge them if you can. """
     return color_string.replace("m\x1b[", ";")
 
@@ -66,13 +66,13 @@ cleaner = re.compile(r"\x1b\[[0-9;]*[A-Zmh]")
 makeNL = re.compile(r"\x1b\[[0-9;]*[JK]")
 
 
-def treatAsNL(line):
+def treatAsNL(line: str):
     """ Replace any ANSI codes that would be better understood as newlines. """
     global makeNL
     return makeNL.sub("\n", line)
 
 
-def cleanANSI(line):
+def cleanANSI(line: str):
     """ Remove all ANSI codes. """
     global cleaner
     return cleaner.sub("", line)
@@ -103,7 +103,7 @@ class Game(protocol.Protocol):
         self.setPlayerReceived()
         self.observer.connect("user-game", self.show_game)
 
-    def show_game(self, game):
+    def show_game(self, game: tuple):
         self.usergame = game
         log.msg("## User-Game:", game)
         if game[1] is None:
@@ -111,12 +111,6 @@ class Game(protocol.Protocol):
                 # start the save
                 coiterate(self.gamedata.save())
             self.gamedata = None
-            if hasattr(self, "portdata"):
-                log.msg("Clearing out old portdata.")
-                self.portdata = {}
-            if hasattr(self, "warpdata"):
-                log.msg("Clearing out old warpdata.")
-                self.warpdata = {}
         else:
             # Load the game data (if any)
             self.gamedata = GameData(game)
@@ -143,7 +137,7 @@ class Game(protocol.Protocol):
                 log.msg(">> [{0}]".format(chunk.decode("utf-8", "ignore")))
             self.setPlayerReceived()
 
-    def warpline(self, line):
+    def warpline(self, line: str):
         log.msg("warp:", line)
         # 1 > 3 > 5 > 77 > 999
         last_sector = self.lastwarp
@@ -156,7 +150,7 @@ class Game(protocol.Protocol):
             last_sector = sector
             self.lastwarp = sector
 
-    def cimline(self, line):
+    def cimline(self, line: str):
         # log.msg(self.linestate, ":", line)
         if line[-1] == "%":
             self.linestate = "portcim"
@@ -206,7 +200,7 @@ class Game(protocol.Protocol):
             else:
                 self.linestate = "cim"
 
-    def sectorline(self, line):
+    def sectorline(self, line: str):
         log.msg("sector:", self.current_sector, ':', line)
         if line.startswith('Beacon  : '):
             pass # get beacon text
@@ -260,7 +254,7 @@ class Game(protocol.Protocol):
             self.sector_state = 'normal'
             self.linestate = ''
 
-    def portline(self, line):
+    def portline(self, line: str):
         # Map these items to which keys
         log.msg("portline({0}): {1}".format(self.current_sector, line))
         mapto = { 'Fuel': 'fuel', 'Organics': 'org', 'Equipment': 'equ'}
@@ -274,7 +268,7 @@ class Game(protocol.Protocol):
             self.gamedata.set_port(self.current_sector, data)
             # log.msg("NOW: {0}".format(self.gamedata.ports[self.current_sector]))
 
-    def lineReceived(self, line):
+    def lineReceived(self, line: str):
         """ line received from the game. """
         if "log_lines" in config and config["log_lines"]:
             log.msg("<< [{0}]".format(line))
@@ -431,7 +425,7 @@ class GlueFactory(protocol.ClientFactory):
     maxDelay = 10
     protocol = Game
 
-    def __init__(self, player):
+    def __init__(self, player: Player):
         self.player = player
         self.queue_player = player.queue_player
         self.queue_game = player.queue_game