All tests passing for Python 3.2. refs #109

Author: GraylinKim

sc2reader/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function, unicode_literals, division
 
 import os
 import sys

sc2reader/constants.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals, division
 
 # These are found in Repack-MPQ/fileset.{locale}#Mods#Core.SC2Mod#{locale}.SC2Data/LocalizedData/Editor/EditorCategoryStrings.txt
 # EDSTR_CATEGORY_Race
@@ -156,7 +157,7 @@
 import json
 import pkgutil
 
-attributes_json = pkgutil.get_data('sc2reader.data', 'attributes.json')
+attributes_json = pkgutil.get_data('sc2reader.data', 'attributes.json').decode('utf8')
 attributes_dict = json.loads(attributes_json)
 LOBBY_PROPERTIES = dict()
 for key, value in attributes_dict.get('attributes', dict()).items():

sc2reader/data/__init__.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals, division
 
 import json
 import pkgutil
@@ -11,23 +12,26 @@
 from sc2reader.log_utils import loggable
 
 ABIL_LOOKUP = dict()
-for entry in pkgutil.get_data('sc2reader.data', 'ability_lookup.csv').split('\n'):
-    if not entry: continue
-    str_id, abilities = entry.split(',',1)
+for entry in pkgutil.get_data('sc2reader.data', 'ability_lookup.csv').decode('utf8').split('\n'):
+    if not entry:
+        continue
+    str_id, abilities = entry.split(',', 1)
     ABIL_LOOKUP[str_id] = abilities.split(',')
 
 UNIT_LOOKUP = dict()
-for entry in pkgutil.get_data('sc2reader.data', 'unit_lookup.csv').split('\n'):
-    if not entry: continue
+for entry in pkgutil.get_data('sc2reader.data', 'unit_lookup.csv').decode('utf8').split('\n'):
+    if not entry:
+        continue
     str_id, title = entry.strip().split(',')
     UNIT_LOOKUP[str_id] = title
 
-unit_data = pkgutil.get_data('sc2reader.data', 'unit_info.json')
+unit_data = pkgutil.get_data('sc2reader.data', 'unit_info.json').decode('utf8')
 unit_lookup = json.loads(unit_data)
 
-command_data = pkgutil.get_data('sc2reader.data', 'train_commands.json')
+command_data = pkgutil.get_data('sc2reader.data', 'train_commands.json').decode('utf8')
 train_commands = json.loads(command_data)
 
+
 class Unit(object):
     """
     Represents an in-game unit.
@@ -64,7 +68,7 @@ def __init__(self, unit_id, flags):
         #: in order by frame the type was acquired.
         self.type_history = OrderedDict()
 
-
+        #: Is this unit type a hallucinated one? Unsure of this flag..
         self.hallucinated = (flags & 2 == 2)
 
     def set_type(self, unit_type, frame):
@@ -84,7 +88,7 @@ def is_type(self, unit_type, strict=True):
                 if self._type_class:
                     return unit_type == self._type_class.str_id
                 else:
-                    return unit_type == None
+                    return unit_type is None
         else:
             if isinstance(unit_type, int):
                 if self._type_class:
@@ -97,7 +101,7 @@ def is_type(self, unit_type, strict=True):
                 if self._type_class:
                     return unit_type in [utype.str_id for utype in self.type_history.values()]
                 else:
-                    return unit_type == None
+                    return unit_type is None
 
     @property
     def name(self):
@@ -154,6 +158,24 @@ def __str__(self):
     def __cmp__(self, other):
         return cmp(self.id, other.id)
 
+    def __lt__(self, other):
+        return self.id < other.id
+
+    def __le__(self, other):
+        return self.id <= other.id
+
+    def __eq__(self, other):
+        return self.id == other.id
+
+    def __ne__(self, other):
+        return self.id != other.id
+
+    def __gt__(self, other):
+        return self.id > other.id
+
+    def __ge__(self, other):
+        return self.id >= other.id
+
     def __hash__(self):
         return hash(self.id)
 
@@ -193,7 +215,7 @@ class Build(object):
     """
     def __init__(self, build_id):
         #: The integer id of the build
-        self.id=build_id
+        self.id = build_id
 
         #: A dictionary mapping integer ids to available unit types.
         self.units = dict()
@@ -223,10 +245,10 @@ def change_type(self, unit, new_type, frame):
             unit_type = self.units[new_type]
             unit.set_type(unit_type, frame)
         else:
-            self.logger.error("Unable to change type of {0} to {1} [frame {2}]; unit type not found in build {3}".format(unit,new_type,frame,self.id))
+            self.logger.error("Unable to change type of {0} to {1} [frame {2}]; unit type not found in build {3}".format(unit, new_type, frame, self.id))
 
     def add_ability(self, ability_id, name, title=None, is_build=False, build_time=None, build_unit=None):
-        ability = type(name,(Ability,), dict(
+        ability = type(str(name), (Ability,), dict(
             id=ability_id,
             name=name,
             title=title or name,
@@ -238,7 +260,7 @@ def add_ability(self, ability_id, name, title=None, is_build=False, build_time=N
         self.abilities[ability_id] = ability
 
     def add_unit_type(self, type_id, str_id, name, title=None, race='Neutral', minerals=0, vespene=0, supply=0, is_building=False, is_worker=False, is_army=False):
-        unit = type(name,(Unit,), dict(
+        unit = type(str(name), (Unit,), dict(
             id=type_id,
             str_id=str_id,
             name=name,
@@ -255,41 +277,44 @@ def add_unit_type(self, type_id, str_id, name, title=None, race='Neutral', miner
         self.units[type_id] = unit
         self.units[str_id] = unit
 
+
 def load_build(expansion, version):
     build = Build(version)
 
-    unit_file = '{0}/{1}_units.csv'.format(expansion,version)
-    for entry in pkgutil.get_data('sc2reader.data', unit_file).split('\n'):
-        if not entry: continue
+    unit_file = '{0}/{1}_units.csv'.format(expansion, version)
+    for entry in pkgutil.get_data('sc2reader.data', unit_file).decode('utf8').split('\n'):
+        if not entry:
+            continue
         int_id, str_id = entry.strip().split(',')
-        unit_type = int(int_id,10)
+        unit_type = int(int_id, 10)
         title = UNIT_LOOKUP[str_id]
 
         values = dict(type_id=unit_type, str_id=str_id, name=title)
-        for race in ('Protoss','Terran','Zerg'):
+        for race in ('Protoss', 'Terran', 'Zerg'):
             if title.lower() in unit_lookup[race]:
                 values.update(unit_lookup[race][title.lower()])
-                values['race']=race
+                values['race'] = race
                 break
 
         build.add_unit_type(**values)
 
-    abil_file = '{0}/{1}_abilities.csv'.format(expansion,version)
+    abil_file = '{0}/{1}_abilities.csv'.format(expansion, version)
     build.add_ability(ability_id=0, name='RightClick', title='Right Click')
-    for entry in pkgutil.get_data('sc2reader.data', abil_file).split('\n'):
-        if not entry: continue
+    for entry in pkgutil.get_data('sc2reader.data', abil_file).decode('utf8').split('\n'):
+        if not entry:
+            continue
         int_id_base, str_id = entry.strip().split(',')
-        int_id_base = int(int_id_base,10) << 5
+        int_id_base = int(int_id_base, 10) << 5
 
         abils = ABIL_LOOKUP[str_id]
-        real_abils = [(i,abil) for i,abil in enumerate(abils) if abil.strip()!='']
+        real_abils = [(i, abil) for i, abil in enumerate(abils) if abil.strip() != '']
 
-        if len(real_abils)==0:
+        if len(real_abils) == 0:
             real_abils = [(0, str_id)]
 
         for index, ability_name in real_abils:
             unit_name, build_time = train_commands.get(ability_name, ('', 0))
-            if 'Hallucinated' in unit_name: # Not really sure how to handle hallucinations
+            if 'Hallucinated' in unit_name:  # Not really sure how to handle hallucinations
                 unit_name = unit_name[12:]
 
             build.add_ability(
@@ -304,13 +329,12 @@ def load_build(expansion, version):
 
 # Load the WoL Data
 wol_builds = dict()
-for version in ('16117','17326','18092','19458','22612','24944'):
+for version in ('16117', '17326', '18092', '19458', '22612', '24944'):
     wol_builds[version] = load_build('WoL', version)
 
 # Load HotS Data
 hots_builds = dict()
-for version in ('base','23925','24247','24764'):
+for version in ('base', '23925', '24247', '24764'):
     hots_builds[version] = load_build('HotS', version)
 
-builds = {'WoL':wol_builds,'HotS':hots_builds}
-
+builds = {'WoL': wol_builds, 'HotS': hots_builds}