Links the message and the player classes directly instead of indirectly through pid and updates the tests to reflect the changes

Author: GraylinKim

sc2reader/objects.py

@@ -130,7 +130,7 @@ def __init__(self, time, player, target, text):
 
     def __str__(self):
         time = ((self.time/16)/60, (self.time/16)%60)
-        return "%s - Player %s - %s" % (time, self.player, self.text)
+        return "%s - Player %s - %s" % (time, self.player.pid, self.text)
 
     def __repr__(self):
         return str(self)

sc2reader/parsers.py

@@ -173,7 +173,7 @@ def load(self, replay, filecontents):
                     length += 128
 
                 text = bytes.get_string(length)
-                replay.messages.append(Message(time, player_id, target, text))
+                replay.messages.append(Message(time, replay.player[player_id], target, text))
 
         recorders = [player for player in replay.players if player and player.recorder==True]
         if len(recorders) > 1:

test_replays/test_all.py

@@ -70,20 +70,30 @@ def test_1():
     assert boom.url == "http://eu.battle.net/sc2/en/profile/1694745/1/Boom/"
 
     assert len(replay.messages) == 12
-    assert find(lambda player: player.pid == replay.messages[0].player, replay.players).name == "Emperor"
     assert replay.messages[0].text == "hf"
+    assert replay.messages[0].player.name == "Emperor"
     assert replay.messages[1].text == "HEYA"
+    assert replay.messages[1].player.name == "Boom"
     assert replay.messages[2].text == "gl hf"
+    assert replay.messages[2].player.name == "Boom"
     assert replay.messages[3].text == "sry for caps"
+    assert replay.messages[3].player.name == "Boom"
     assert replay.messages[4].text == "^^"
+    assert replay.messages[4].player.name == "Emperor"
     assert replay.messages[5].text == "noppe"
+    assert replay.messages[5].player.name == "Emperor"
     assert replay.messages[6].text == "you greedy bastard"
+    assert replay.messages[6].player.name == "Boom"
     assert replay.messages[7].text == "ggg"
+    assert replay.messages[7].player.name == "Boom"
     assert replay.messages[8].text == "WG"
+    assert replay.messages[8].player.name == "Emperor"
     assert replay.messages[9].text == "wg? :)"
+    assert replay.messages[9].player.name == "Boom"
     assert replay.messages[10].text == "wipe"
+    assert replay.messages[10].player.name == "Emperor"
     assert replay.messages[11].text == "huh?"
-    assert find(lambda player: player.pid == replay.messages[11].player, replay.players).name == "Boom"
+    assert replay.messages[11].player.name == "Boom"
 
     for msg in replay.messages:
         assert sent_to_all(msg) == True