Remove trailing whitespaces from previous commits.

Author: GraylinKim

sc2reader/resources.py

@@ -508,7 +508,7 @@ class GameSummary(Resource):
         'SB',
         'SRC',
         ]
-    
+
     #: Game speed
     game_speed = str()
 
@@ -520,7 +520,7 @@ class GameSummary(Resource):
 
     #: Lobby properties
     lobby_properties = dict()
-    
+
     #: Lobby player properties
     lobby_player_properties = dict()
 
@@ -544,7 +544,7 @@ class GameSummary(Resource):
 
     #: Map localization urls
     localization_urls = dict()
-    
+
     def __init__(self, summary_file, filename=None, **options):
         super(GameSummary, self).__init__(summary_file, filename,**options)
 
@@ -571,7 +571,7 @@ def __init__(self, summary_file, filename=None, **options):
         # { 0: 11987, 1: 283385849, 2: 1334719793L}
         # 0, 1 might be an adjustment of some sort
         self.unknown_time = self.parts[0][2][2]
-        
+
         # this one is alone
         self.time = self.parts[0][8]
 
@@ -591,9 +591,9 @@ def __init__(self, summary_file, filename=None, **options):
 
             player = PlayerSummary(player_struct[0][0])
             player.race = RACE_CODES[''.join(reversed(player_struct[2]))]
-            
+
             # TODO: Grab team id from lobby_player_properties
-            player.teamid = 0 
+            player.teamid = 0
 
             player.is_winner = (player_struct[1][0] == 0)
             if player.is_winner:
@@ -604,7 +604,7 @@ def __init__(self, summary_file, filename=None, **options):
                 player.is_ai = True
             else:
                 player.is_ai = False
-                
+
                 player.bnetid = player_struct[0][1][0][3]
                 player.subregion = player_struct[0][1][0][2]
 
@@ -614,12 +614,12 @@ def __init__(self, summary_file, filename=None, **options):
                 # Example:
                 # { 0: 3405691582L, 1: 11402158793782460416L}
                 player.unknown2 = player_struct[0][1][1]
-            
+
             self.players[player.pid] = player
             if not player.teamid in self.teams:
                 self.teams[player.teamid] = list()
             self.teams[player.teamid].append(player.pid)
-            
+
         # Parse graph and stats stucts, for each player
         for pid in self.players:
             p = self.players[pid]
@@ -629,15 +629,15 @@ def __init__(self, summary_file, filename=None, **options):
 
             xy = [(o[2], o[0]) for o in self.parts[4][0][1][1][p.pid]]
             p.income_graph = Graph([], [], xy_list=xy)
-            
+
             # Stats stuff
             stats_struct = self.parts[3][0]
             # The first group of stats is located in parts[3][0]
             for i in range(len(stats_struct)):
                 p.stats[self.stats_keys[i]] = stats_struct[i][1][p.pid][0][0]
             # The last piece of stats is in parts[4][0][0][1]
             p.stats[self.stats_keys[len(stats_struct)]] = self.parts[4][0][0][1][p.pid][0][0]
-        
+
         # Parse map localization data
         for l in self.parts[0][6][8]:
             lang = l[0]
@@ -647,15 +647,15 @@ def __init__(self, summary_file, filename=None, **options):
                 if parsed_hash['server'] == '\x00\x00':
                     continue
                 urls.append(self.base_url_template.format(parsed_hash['server'], parsed_hash['hash'], parsed_hash['type']))
-                    
+
             self.localization_urls[lang] = urls
 
         # Parse map images
         for hash in self.parts[0][6][7]:
             parsed_hash = utils.parse_hash(hash)
             self.image_urls.append(self.base_url_template.format(parsed_hash['server'], parsed_hash['hash'], parsed_hash['type']))
 
-        # Parse build orders        
+        # Parse build orders
         bo_structs = [x[0] for x in self.parts[5:]]
         bo_structs.append(self.parts[4][0][3:])
 
@@ -665,14 +665,14 @@ def __init__(self, summary_file, filename=None, **options):
             bo = list()
             for bo_struct in bo_structs:
                 for order in bo_struct:
-                    
+
                     if order[0][1] >> 24 == 0x01:
                         # unit
                         parsed_order = utils.get_unit(order[0][1])
                     elif order[0][1] >> 24 == 0x02:
                         # research
                         parsed_order = utils.get_research(order[0][1])
-                    
+
                     for entry in order[1][p.pid]:
                         bo.append({
                                 'supply' : entry[0],
@@ -683,7 +683,7 @@ def __init__(self, summary_file, filename=None, **options):
                                 })
             bo.sort(key=lambda x: x['build_index'])
             self.build_orders[p.pid] = bo
-                        
+
 
     def __str__(self):
         return "{} - {:0>2}:{:0>2}:{:0>2} {}".format(time.ctime(self.time),
@@ -692,7 +692,7 @@ def __str__(self):
                                          (int(self.game_length)%3600)%60,
                                          'v'.join(''.join(self.players[p].race[0] for p in self.teams[tid]) for tid in self.teams))
 
-    
+
 
 class MapInfo(Resource):
     url_template = 'http://{0}.depot.battle.net:1119/{1}.s2mi'
@@ -734,7 +734,7 @@ class MapHeader(Resource):
 
     #: Link to the map file
     map_url = str()
-    
+
     #: Hash of the map image
     image_hash = str()
 
@@ -756,17 +756,17 @@ def __init__(self, header_file, filename=None, **options):
 
         # Blizzard
         self.blizzard = (self.data[0][11] == 'BLIZ')
-        
+
         # Parse image hash
         parsed_hash = utils.parse_hash(self.data[0][1])
         self.image_hash = parsed_hash['hash']
         self.image_url = self.image_url_template.format(parsed_hash['server'], parsed_hash['hash'])
-        
+
         # Parse map hash
         parsed_hash = utils.parse_hash(self.data[0][2])
         self.map_hash = parsed_hash['hash']
         self.map_url = self.base_url_template.format(parsed_hash['server'], parsed_hash['hash'], parsed_hash['type'])
-        
+
         # Parse localization hashes
         l18n_struct = self.data[0][4][8]
         for l in l18n_struct:

sc2reader/utils.py

@@ -739,13 +739,13 @@ def get_unit(type_int):
     except:
         #Nope, create
         data_obj = Data()
-    
+
     # Try to parse a unit
     try:
         unit = data_obj.type(((type_int & 0xff) << 8) | 0x01)
     except:
         unit = None
-    
+
     return {
         'name': unit.name if unit else "Unknown unit ({})".format(hex(type_int)) ,
         'type_int':hex(type_int)
@@ -772,7 +772,7 @@ def parse_hash(hash_string):
     server = hash_string[6:8]
     hash = hash_string[8:]
     return {
-        'server': server, 
+        'server': server,
         'hash' : ''.join([('%02x' % ord(x)) for x in hash]),
         'type' : hash_string[0:4]
         }
@@ -826,24 +826,24 @@ def __str__(self):
 def get_lobby_properties(data):
     ###
     # The definition of each lobby property is in data[0][5] with the structure
-    # 
-    # id = def[0][1] # The unique property id  
+    #
+    # id = def[0][1] # The unique property id
     # vals = def[1]  # A list with the values the property can be
     # reqs = def[3]  # A list of requirements the property has
     # dflt = def[8]  # The default value(s) of the property
     #                this is a single entry for a global property
     #                and a list() of entries for a player property
-    
+
     # The def-values is structured like this
     #
     # id = `the index in the vals list`
     # name = v[0]    # The name of the value
-    
+
     # The requirement structure looks like this
-    # 
+    #
     # id = r[0][1][1] # The property id of this requirement
     # vals = r[1]     # A list of names of valid values for this requirement
-    
+
     ###
     # The values of each property is in data[0][6][6] with the structure
     #
@@ -856,7 +856,7 @@ def get_lobby_properties(data):
     # A value-entry looks like this
     #
     # index = v[0]  # The index in the def.vals array representing the value
-    # unknown = v[1] 
+    # unknown = v[1]
 
     # First get the definitions in data[0][5]
     defs = dict()
@@ -867,7 +867,7 @@ def get_lobby_properties(data):
             'vals':d[1],
             'reqs':d[3],
             'dflt':d[8],
-            'lobby_prop':type(d[8]) == type(dict()) 
+            'lobby_prop':type(d[8]) == type(dict())
             }
     vals = dict()
 
@@ -878,14 +878,14 @@ def get_lobby_properties(data):
             'id':k,
             'vals':v[1]
             }
-    
+
     lobby_ids = [k for k in defs if defs[k]['lobby_prop']]
     lobby_ids.sort()
     player_ids = [k for k in defs if not defs[k]['lobby_prop']]
     player_ids.sort()
 
     left_lobby = deque([k for k in defs if defs[k]['lobby_prop']])
-    
+
     lobby_props = dict()
     # We cycle through all property values 'til we're done
     while len(left_lobby) > 0:
@@ -900,7 +900,7 @@ def get_lobby_properties(data):
                 break
             # Is this requirement fullfilled?
             active = active and (lobby_props[req[0][1][1]] in req[1])
-            
+
         if not can_be_parsed:
             # Try parse this later
             left_lobby.append(propid)
@@ -916,7 +916,7 @@ def get_lobby_properties(data):
     for pid in range(16):
         left_players = deque([a for a in player_ids])
         player = dict()
-        
+
         # Use this to avoid an infinite loop
         last_success = 0
         max = len(left_players)
@@ -935,7 +935,7 @@ def get_lobby_properties(data):
                     if not can_be_parsed:
                         break
                     active = active and (player[req[0][1][1]] in req[1])
-                
+
             if not can_be_parsed:
                 left_players.append(propid)
                 continue
@@ -946,4 +946,4 @@ def get_lobby_properties(data):
 
         player_props[pid] = player
 
-    return (lobby_props, player_props) 
+    return (lobby_props, player_props)