added mpyq to the local dir to more quickly get the development version

Author: alexhanh

mpyq

@@ -0,0 +1 @@
+Subproject commit 0f6c6b7848ac3dd92147d8036dceec534a27b64b

sc2reader/parsers.py

@@ -98,12 +98,7 @@ def load(self, replay, filecontents):
 
         #Get global settings first
         replay.speed = data[16]['Game Speed']
-        
-        #TODO: Do we need the category variable at this point?
         replay.category = data[16]['Category']
-        replay.is_ladder = (replay.category == "Ladder")
-        replay.is_private = (replay.category == "Private")
-        
         replay.type = data[16]['Game Type']
 
         #Set player attributes as available,  requires already populated player list

sc2reader/replay.py

@@ -2,6 +2,8 @@
 from collections import defaultdict
 
 from mpyq import MPQArchive
+from mpyq import __version__ as version
+print version
 
 import parsers
 from utils import ByteStream,PlayerDict
@@ -57,12 +59,12 @@ def __init__(self, replay, partial_parse=True, full_parse=True):
         self._parse_header()
 
         #Manually extract the contents of SC2Replay file (bypass the listfile)
-        archive = MPQArchive(replay, False)
-        self._files['replay.initData'] = archive.read('replay.initData')
-        self._files['replay.details'] = archive.read('replay.details')
-        self._files['replay.attributes.events'] = archive.read('replay.attributes.events')
-        self._files['replay.message.events'] = archive.read('replay.message.events')
-        self._files['replay.game.events'] = archive.read('replay.game.events')
+        archive = MPQArchive(replay, listfile=False)
+        self._files['replay.initData'] = archive.read_file('replay.initData')
+        self._files['replay.details'] = archive.read_file('replay.details')
+        self._files['replay.attributes.events'] = archive.read_file('replay.attributes.events')
+        self._files['replay.message.events'] = archive.read_file('replay.message.events')
+        self._files['replay.game.events'] = archive.read_file('replay.game.events')
 
         #These are quickly parsed files that contain most of the game information
         #The order is important, I need some way to reinforce it in the future

setup.py

@@ -28,7 +28,7 @@
 		],
 
 	requires=['mpyq'],
-    install_requires=['mpyq'],
+    install_requires=['mpyq>=0.1.4'],
 	packages=['sc2reader'],
 	scripts=['scripts/sc2printer'],
 )

test_replays/test_all.py

@@ -115,7 +115,7 @@ def test_ffa():
     # Source: http://drop.sc/83
     replay = Replay("test_replays/build17811/8.sc2replay")
     assert replay.type == "FFA"
-    assert replay.player['Boom'].result = "Won"
+    assert replay.player['Boom'].result == "Won"
 
 def test_random_player():
     replay = Replay("test_replays/build17811/3.sc2replay")