clear up region/gateway confusion for s2gs

Author: dsjoerg

sc2reader/objects.py

@@ -272,6 +272,14 @@ class PlayerSummary():
     #: Subregion id of player
     subregion = int()
 
+    #: The player's gateway, such as us, eu
+    gateway = str()
+
+    #: The player's region, such as na, la, eu or ru.  This is
+    # provided for convenience, but as of 20121018 is strictly a
+    # function of gateway and subregion.
+    region = str()
+
     #: unknown1
     unknown1 = int()
 

sc2reader/resources.py

@@ -781,7 +781,7 @@ def load_translations(self):
             self.localization_urls[language] = files
 
         # Grab the gateway from the one of the files
-        self.region = self.localization_urls.values()[0][0].server
+        self.gateway = self.localization_urls.values()[0][0].server
 
         # Each of the localization urls points to an XML file with a set of
         # localization strings and their unique ids. After reading these mappings
@@ -954,8 +954,9 @@ def load_players(self):
             settings = self.player_settings[index]
             player.is_ai = not isinstance(struct[0][1], dict)
             if not player.is_ai:
-                player.region = self.region
+                player.gateway = self.gateway
                 player.subregion = struct[0][1][0][2]
+                player.region = REGIONS[player.gateway][player.subregion]
                 player.bnetid = struct[0][1][0][3]
                 player.unknown1 = struct[0][1][0]
                 player.unknown2 = struct[0][1][1]