Take 3. Its like whack-a-mole in here.

Author: GraylinKim

sc2reader/objects.py

@@ -404,7 +404,7 @@ def __init__(self, x, y, xy_list=None):
 
     def as_points(self):
         """ Get the graph as a list of (x, y) tuples """
-        return zip(self.times, self.values)
+        return list(zip(self.times, self.values))
 
     def __str__(self):
         return "Graph with {0} values".format(len(self.times))

sc2reader/resources.py

@@ -737,7 +737,7 @@ def __init__(self, summary_file, filename=None, lang='enUS', **options):
             self.parts.append(buffer.read_struct())
 
         self.end_time = datetime.utcfromtimestamp(self.parts[0][8])
-        self.game_speed = LOBBY_PROPERTIES[0xBB8][1][self.parts[0][0][1]]
+        self.game_speed = LOBBY_PROPERTIES[0xBB8][1][self.parts[0][0][1].decode('utf8')]
         self.game_length = utils.Length(seconds=self.parts[0][7])
         self.real_length = utils.Length(seconds=int(self.parts[0][7]/GAME_SPEED_FACTOR[self.game_speed]))
         self.start_time = datetime.utcfromtimestamp(self.parts[0][8] - self.real_length.seconds)
@@ -803,16 +803,16 @@ def load_translations(self):
         #
         # Sometimes these byte strings are all NULLed out and need to be ignored.
         for localization in self.parts[0][6][8]:
-            language = localization[0]
+            language = localization[0].decode('utf8')
 
             files = list()
             for file_hash in localization[1]:
-                if file_hash[:4] != '\x00\x00\x00\x00':
+                if file_hash[:4].decode('utf8') != '\x00\x00\x00\x00':
                     files.append(utils.DepotFile(file_hash))
             self.localization_urls[language] = files
 
         # Grab the gateway from the one of the files
-        self.gateway = self.localization_urls.values()[0][0].server.lower()
+        self.gateway = list(self.localization_urls.values())[0][0].server.lower()
 
         # Each of the localization urls points to an XML file with a set of
         # localization strings and their unique ids. After reading these mappings

test_replays/test_all.py

@@ -6,7 +6,7 @@
 
 # Newer unittest features aren't built in for python 2.6
 import sys
-if sys.version_info[:2] <= (2, 7):
+if sys.version_info[:2] < (2, 7):
     import unittest2 as unittest
 else:
     import unittest

test_s2gs/test_all.py

@@ -15,26 +15,26 @@ class TestSummaries(unittest.TestCase):
 
     def test_a_WoL_s2gs(self):
         summary = sc2reader.load_game_summary("test_s2gs/s2gs1.s2gs")
-        self.assertEquals(summary.players[0].resource_collection_rate, 1276)
-        self.assertEquals(summary.players[0].build_order[0].order, 'Probe')
-        self.assertEquals(summary.expansion, 'WoL')
+        self.assertEqual(summary.players[0].resource_collection_rate, 1276)
+        self.assertEqual(summary.players[0].build_order[0].order, 'Probe')
+        self.assertEqual(summary.expansion, 'WoL')
 
     def test_a_HotS_s2gs(self):
         summary = sc2reader.load_game_summary("test_s2gs/hots1.s2gs")
-        self.assertEquals(summary.players[0].resource_collection_rate, 1599)
-        self.assertEquals(summary.players[0].build_order[0].order, 'SCV')
-        self.assertEquals(summary.expansion, 'HotS')
+        self.assertEqual(summary.players[0].resource_collection_rate, 1599)
+        self.assertEqual(summary.players[0].build_order[0].order, 'SCV')
+        self.assertEqual(summary.expansion, 'HotS')
 
     def test_another_HotS_s2gs(self):
         summary = sc2reader.load_game_summary("test_s2gs/hots2.s2gs")
-        self.assertEquals(summary.players[0].enemies_destroyed, 14575)
-        self.assertEquals(summary.players[0].time_supply_capped, 50)
-        self.assertEquals(summary.players[0].idle_production_time, 4438)
-        self.assertEquals(summary.players[0].resources_spent, 25450)
-        self.assertEquals(summary.players[0].apm, 204)
-        self.assertEquals(summary.players[0].workers_active_graph.as_points()[8][1], 25)
-        self.assertEquals(summary.players[0].upgrade_spending_graph.as_points()[8][1], 300)
-        self.assertEquals(summary.expansion, 'HotS')
+        self.assertEqual(summary.players[0].enemies_destroyed, 14575)
+        self.assertEqual(summary.players[0].time_supply_capped, 50)
+        self.assertEqual(summary.players[0].idle_production_time, 4438)
+        self.assertEqual(summary.players[0].resources_spent, 25450)
+        self.assertEqual(summary.players[0].apm, 204)
+        self.assertEqual(summary.players[0].workers_active_graph.as_points()[8][1], 25)
+        self.assertEqual(summary.players[0].upgrade_spending_graph.as_points()[8][1], 300)
+        self.assertEqual(summary.expansion, 'HotS')
 
 if __name__ == '__main__':
     unittest.main()