Merge branch 'jsanders'

Author: GraylinKim

profile.py

@@ -21,15 +21,14 @@ def parse_replays():
             replay = Replay(file)
 
 # Problem with the profiler is that it adds conciderable amount of overhead
-cProfile.run("parse_replays()","replay_profile")
-stats = Stats("replay_profile")
-stats.strip_dirs().sort_stats("time").print_stats(30)
+# cProfile.run("parse_replays()","replay_profile")
+# stats = Stats("replay_profile")
+# stats.strip_dirs().sort_stats("time").print_stats(30)
 
-# start = time.time()
-# for run in range(1,4):
-#     parse_replays()
-# end = time.time() - start
-# print end
+start = time.time()
+parse_replays()
+diff = time.time() - start
+print diff
 
 # ========================================
 # Results for March 1 2011

sc2reader/utils.py

@@ -1,6 +1,6 @@
 class PlayerDict(dict):
     """Delete is supported on the pid index only"""
-    def __init__(self,*args,**kwargs):
+    def __init__(self, *args, **kwargs):
         self._key_map = dict()
 
         if args:
@@ -10,27 +10,27 @@ def __init__(self,*args,**kwargs):
 
         if kwargs:
             print kwargs
-            for key,value in kwargs.iteritems():
+            for key, value in kwargs.iteritems():
                 self[key] = value
 
-    def __getitem__(self,key):
-        if isinstance(key,str):
+    def __getitem__(self, key):
+        if isinstance(key, str):
             key = self._key_map[key]
 
-        return super(PlayerDict,self).__getitem__(key)
+        return super(PlayerDict, self).__getitem__(key)
 
-    def __setitem__(self,key,value):
-        if isinstance(key,str):
+    def __setitem__(self, key, value):
+        if isinstance(key, str):
             self._key_map[key] = value.pid
             key = value.pid
-        elif isinstance(key,int):
+        elif isinstance(key, int):
             self._key_map[value.name] = key
 
-        super(PlayerDict,self).__setitem__(value.pid,value)
+        super(PlayerDict, self).__setitem__(value.pid, value)
 
 
 from cStringIO import StringIO
-from os import SEEK_CUR,SEEK_END
+from os import SEEK_CUR, SEEK_END
 from struct import unpack
 
 class ByteStream(object):

test_replays/build16561/test.sc2replay test_replays/build16561/test.SC2Replaytest_replays/build16561/test.sc2replay renamed to test_replays/build16561/test.SC2Replay

@@ -1,4 +1,4 @@
-1.sc2replay
+1.SC2Replay
 Date played		20 Feb 2011 22:44:48
 Duration 			32:47
 Region/Realm 	EU
@@ -27,7 +27,7 @@ Messages (count=12):
 	Boom [All]: huh?
 
 
-2.sc2replay
+2.SC2Replay
 Date played		21 Feb 2011 00:42:13
 Duration 			9:09
 Region/Realm 	EU
@@ -45,7 +45,7 @@ Messages (count=1):
 	Laquendi [All]: gg
 
 
-3.sc2replay
+3.SC2Replay
 Date played		25 Feb 2011 16:36:28
 Duration 			10:29
 Region/Realm 	EU
@@ -64,4 +64,4 @@ Players (no observers)
 		Foco			Terran
 Messages (count=25):
 	First msg:		loropendejo [Allies]: hi
-	Last msg:		  Aspirates [Allies]: all team goo
+	Last msg:		  Aspirates [Allies]: all team goo

test_replays/build17811/4.sc2replay test_replays/build17811/4.SC2Replaytest_replays/build17811/4.sc2replay renamed to test_replays/build17811/4.SC2Replay

@@ -15,12 +15,12 @@ def test_empty():
     # Maybe a "production" mode would be nice to have, so that it simply returns a status of the parse without
     # raising an exception.
     with pytest.raises(ValueError):
-        Replay("test_replays/corrupted/empty.sc2replay")
+        Replay("test_replays/corrupted/empty.SC2Replay")
 
 # Tests for build 17811 replays
 
 def test_standard_1v1():
-    replay = Replay("test_replays/build17811/1.sc2replay")
+    replay = Replay("test_replays/build17811/1.SC2Replay")
 
 #    assert replay.date == "20 Feb 2011 22:44:48"
     assert replay.length == (32, 47)
@@ -88,28 +88,28 @@ def test_standard_1v1():
         assert msg.sent_to_all == True
 
 def test_private_category():
-    replay = Replay("test_replays/build17811/2.sc2replay")
+    replay = Replay("test_replays/build17811/2.SC2Replay")
     assert replay.is_private == True
     assert replay.is_ladder == False
 
 def test_2v2():
-    replay = Replay("test_replays/build17811/7.sc2replay")
+    replay = Replay("test_replays/build17811/7.SC2Replay")
     assert replay.type == "2v2"
 
 def test_3v3():
-    replay = Replay("test_replays/build17811/3.sc2replay")
+    replay = Replay("test_replays/build17811/3.SC2Replay")
     assert replay.type == "3v3"
 
     # Because it's a 3v3 and all of the members of Team 2 quit, we should know the winner.
     assert replay.results[1] == "Won"
     assert replay.results[2] == "Lost"
 
 def test_4v4():
-    replay = Replay("test_replays/build17811/9.sc2replay")
+    replay = Replay("test_replays/build17811/9.SC2Replay")
     assert replay.type == "4v4"
 
 def test_ffa():
-    replay = Replay("test_replays/build17811/8.sc2replay")
+    replay = Replay("test_replays/build17811/8.SC2Replay")
     assert replay.type == "FFA"
 
     # TODO: Remove me when done!
@@ -122,37 +122,37 @@ def test_ffa():
     assert replay.winner_known == False
 
 def test_unknown_winner():
-    replay = Replay("test_replays/build17811/10.sc2replay")
+    replay = Replay("test_replays/build17811/10.SC2Replay")
 
     # Recording player (Boom) left second in a 4v4, so the winner shouldn't be known
     assert replay.winner_known == False
 
 def test_random_player():
-    replay = Replay("test_replays/build17811/3.sc2replay")
+    replay = Replay("test_replays/build17811/3.SC2Replay")
 
     gogeta = replay.player['Gogeta']
     assert gogeta.choosen_race == "Random"
     assert gogeta.actual_race == "Terran"
 
 def test_random_player2():
-    replay = Replay("test_replays/build17811/6.sc2replay")
+    replay = Replay("test_replays/build17811/6.SC2Replay")
     permafrost = replay.player["Permafrost"]
     assert permafrost.choosen_race == "Random"
     assert permafrost.actual_race == "Protoss"
 
 def test_us_realm():
-    replay = Replay("test_replays/build17811/5.sc2replay")
+    replay = Replay("test_replays/build17811/5.SC2Replay")
     assert replay.player['ShadesofGray'].url == "http://us.battle.net/sc2/en/profile/2358439/1/ShadesofGray/"
     assert replay.player['reddawn'].url == "http://us.battle.net/sc2/en/profile/2198663/1/reddawn/"
 
 # We can be really proud: phpsc2replay fails with the messages!
 def test_kr_realm_and_tampered_messages():
-    replay = Replay("test_replays/build17811/11.sc2replay")
+    replay = Replay("test_replays/build17811/11.SC2Replay")
     assert replay.player['명지대학교'].url == "http://kr.battle.net/sc2/en/profile/258945/1/명지대학교/"
     assert replay.player['티에스엘사기수'].url == "http://kr.battle.net/sc2/en/profile/102472/1/티에스엘사기수/"
 
     assert replay.messages[0].text == "sc2.replays.net"
     assert replay.messages[5].text == "sc2.replays.net"
 
 def test_encrypted():
-    replay = Replay("test_replays/build17811/4.sc2replay")
+    replay = Replay("test_replays/build17811/4.SC2Replay")