removed team from actor and changed message.player to message.sender

Author: alexhanh

sc2reader/objects.py

@@ -138,11 +138,10 @@ def __str__(self):
     def __repr__(self):
         return str(self)
 
-# TODO: Refactor message.player to message.sender
 class Message(object):
 
     def __init__(self, time, player, target, text):
-        self.time, self.player, self.target, self.text = time, player, target, text
+        self.time, self.sender, self.target, self.text = time, player, target, text
         self.seconds = time/16
         self.sent_to_all = (self.target == 0)
         self.sent_to_allies = (self.target == 2)
@@ -159,7 +158,6 @@ class Actor(object):
     def __init__(self, is_obs):
         self.pid = None
         self.name = None
-        self.team = None
         self.is_obs = is_obs
         self.messages = list()
         self.events = list()
@@ -170,7 +168,6 @@ def __init__(self, pid, name):
         Actor.__init__(self, True)
         self.pid = pid
         self.name = name
-        self.team = 0 # Observers share the fictitious team 0
 
 class Player(Actor):
 

shell.py

@@ -10,4 +10,4 @@
 # print replay.players[0].rgba
 # print "%02X%02X%02X" % (replay.players[0].rgba['r'], replay.players[0].rgba['g'], replay.players[0].rgba['b'])
 
-replay = Replay("1.sc2replay")
+replay = Replay("13.sc2replay")

test_replays/test_all.py

@@ -60,29 +60,29 @@ def test_standard_1v1():
 
     assert len(replay.messages) == 12
     assert replay.messages[0].text == "hf"
-    assert replay.messages[0].player.name == "Emperor"
+    assert replay.messages[0].sender.name == "Emperor"
     assert replay.messages[1].text == "HEYA"
-    assert replay.messages[1].player.name == "Boom"
+    assert replay.messages[1].sender.name == "Boom"
     assert replay.messages[2].text == "gl hf"
-    assert replay.messages[2].player.name == "Boom"
+    assert replay.messages[2].sender.name == "Boom"
     assert replay.messages[3].text == "sry for caps"
-    assert replay.messages[3].player.name == "Boom"
+    assert replay.messages[3].sender.name == "Boom"
     assert replay.messages[4].text == "^^"
-    assert replay.messages[4].player.name == "Emperor"
+    assert replay.messages[4].sender.name == "Emperor"
     assert replay.messages[5].text == "noppe"
-    assert replay.messages[5].player.name == "Emperor"
+    assert replay.messages[5].sender.name == "Emperor"
     assert replay.messages[6].text == "you greedy bastard"
-    assert replay.messages[6].player.name == "Boom"
+    assert replay.messages[6].sender.name == "Boom"
     assert replay.messages[7].text == "ggg"
-    assert replay.messages[7].player.name == "Boom"
+    assert replay.messages[7].sender.name == "Boom"
     assert replay.messages[8].text == "WG"
-    assert replay.messages[8].player.name == "Emperor"
+    assert replay.messages[8].sender.name == "Emperor"
     assert replay.messages[9].text == "wg? :)"
-    assert replay.messages[9].player.name == "Boom"
+    assert replay.messages[9].sender.name == "Boom"
     assert replay.messages[10].text == "wipe"
-    assert replay.messages[10].player.name == "Emperor"
+    assert replay.messages[10].sender.name == "Emperor"
     assert replay.messages[11].text == "huh?"
-    assert replay.messages[11].player.name == "Boom"
+    assert replay.messages[11].sender.name == "Boom"
 
     for msg in replay.messages:
         assert msg.sent_to_all == True