Assorted bug fixes related to the last half dozen commits.

Author: GraylinKim

sc2reader/__init__.py

@@ -74,11 +74,12 @@ class SC2Reader(object):
 
     def __init__(self, **options):
         self.reset()
+        self.configure(**options)
 
-        if options.get('register_defaults',None):
+        if self.options.get('register_defaults',None):
             self.register_defaults()
 
-        self.configure(**options)
+
 
     def configure(self, **new_options):
         """

sc2reader/objects.py

@@ -66,12 +66,12 @@ class Attribute(object):
         0x0BBB: ("Handicap", None),
         0x0BBC: ("Difficulty", DIFFICULTY_CODES),
         0x0BC1: ("Category", GAME_TYPE_CODES),
-        0x07D2: ("Teams1v1", lambda v: int(self.value[0])),
-        0x07D3: ("Teams2v2", lambda v: int(self.value[0])),
-        0x07D4: ("Teams3v3", lambda v: int(self.value[0])),
-        0x07D5: ("Teams4v4", lambda v: int(self.value[0])),
-        0x07D6: ("TeamsFFA", lambda v: int(self.value[0])),
-        0x07D7: ("Teams5v5", lambda v: int(self.value[0]))
+        0x07D2: ("Teams1v1", lambda value: int(value[0])),
+        0x07D3: ("Teams2v2", lambda value: int(value[0])),
+        0x07D4: ("Teams3v3", lambda value: int(value[0])),
+        0x07D5: ("Teams4v4", lambda value: int(value[0])),
+        0x07D6: ("TeamsFFA", lambda value: int(value[0])),
+        0x07D7: ("Teams5v5", lambda value: int(value[0]))
     }
 
     def __init__(self, data):
@@ -136,7 +136,6 @@ def __init__(self, pid, name):
         self.messages = list()
         self.events = list()
         self.is_human = bool()
-        self.result = "Unknown"
         self.recorder = False # Actual recorder will be determined using the replay.message.events file
 
 class Observer(Person):

sc2reader/replay.py

@@ -268,7 +268,7 @@ def load_players(self):
             # We know there will be a default region because there must be
             # at least 1 human player or we wouldn't have a self.
             for player in self.players:
-                if player.type == 'Computer':
+                if not player.is_human:
                     player.region = default_region
 
             # Create observers out of the leftover names gathered from initData
@@ -280,7 +280,7 @@ def load_players(self):
                 self.person[i+1] = observer
 
         # Miscellaneous people processing
-        self.humans = filter(lambda p: p.type == 'Human', self.people)
+        self.humans = filter(lambda p: p.is_human, self.people)
 
         if 'message_events' in self.raw_data:
             # Figure out recorder