Merge remote-tracking branch 'upstream/master' into ggtracker/upstream

Conflicts:
	CHANGELOG.rst
	sc2reader/data/__init__.py
	sc2reader/data/attributes.json
	sc2reader/engine/plugins/apm.py
	sc2reader/engine/plugins/context.py
	sc2reader/events/game.py
	sc2reader/events/tracker.py
	sc2reader/factories/plugins/replay.py
	sc2reader/readers.py
	sc2reader/resources.py
	sc2reader/scripts/sc2parse.py
	setup.py
	test_replays/test_all.py

Author: StoicLoofah

CHANGELOG.rst

@@ -1,8 +1,7 @@
 CHANGELOG
 ============
 
-
-0.6.5 - December ?? 2013
+0.7.0 -
 ---------------------------
 
 * Deprecated unit.killed_by in favor of unit.killing_player
@@ -17,6 +16,27 @@ CHANGELOG
 * Removed the defunct replay.player_names attribute.
 * Removed the defunct replay.events_by_type attribute.
 * Removed the defunct replay.other_people attribute.
+* Replays can now be pickled and stored for later consumption.
+* All references to the gateway attribute have been replaced in favor of region; e.g. replay.region
+* Use generic UnitType and Ability classes for data. This means no more unit._type_class.__class__.__name__. But hopefully people were not doing that anyway.
+* Now a CorruptTrackerFileError is raised when the tracker file is corrupted (generally only older resume_from_replay replays)
+* Added replay.resume_from_replay flag. See replay.resume_user_info for additional info.
+* PacketEvent is now ProgressEvent.
+* SetToHotkeyEvent is now SetControlGroupEvent.
+* AddToHotkeyEvent is now AddToControlGroupEvent.
+* GetFromHotkeyEvent is now GetControlGroupEvent.
+* PlayerAbilityEvent is no longer part of the event hierarchy.
+* AbilityEvent doubled as both an abstract and concrete class (very bad, see #160). Now split into:
+   * AbilityEvent is now CommandEvent
+   * AbilityEvent is now BasicCommandEvent
+* TargetAbilityEvent is now TargetUnitCommandEvent
+* LocationAbilityEvent is now TargetPointCommandEvent
+* SelfAbilityEvent is now DataCommandEvent
+* Removed the defunct replay.player_names attribute.
+* Removed the defunct replay.events_by_type attribute.
+* Removed the defunct replay.other_people attribute.
+
+* event.name is no longer a class property; it can only be accessed from an event instance.
 * PingEvents now have new attributes:
    * event.to_all - true if ping seen by all
    * event.to_allies - true if ping seen by allies
@@ -28,7 +48,7 @@ CHANGELOG
 ---------------------------
 
 * Fix bug in code for logging errors.
-* Fix siege tank supply count
+* Fix siege tank supply count.
 * Small improvements to message.events parsing.
 
 0.6.3 - September 15th 2013

sc2reader/__init__.py

@@ -20,7 +20,7 @@
 """
 from __future__ import absolute_import, print_function, unicode_literals, division
 
-__version__ = "0.6.4"
+__version__ = "0.7.0-pre"
 
 import os
 import sys

sc2reader/constants.py

@@ -23,7 +23,7 @@
     '프로토스': 'Protoss',
     '저그': 'Zerg',
 
-    # ??eu
+    # plPL
     'Terranie': 'Terran',
     'Protosi': 'Protoss',
     'Zergi': 'Zerg',
@@ -124,7 +124,7 @@
 
 COLOR_CODES_INV = dict(zip(COLOR_CODES.values(), COLOR_CODES.keys()))
 
-REGIONS = {
+SUBREGIONS = {
     # United States
     'us': {
         1: 'us',
@@ -142,6 +142,7 @@
         1: 'kr',
         2: 'tw',
     },
+
     # Taiwan - appear to both map to same place
     'tw': {
         1: 'kr',

sc2reader/data/__init__.py

@@ -73,7 +73,7 @@ def __init__(self, unit_id):
         self.killed_units = list()
 
         #: The unique in-game id for this unit. The id can sometimes be zero because
-        #: TargetAbilityEvents will create a new unit with id zero when a unit
+        #: TargetUnitCommandEvents will create a new unit with id zero when a unit
         #: behind the fog of war is targetted.
         self.id = unit_id