Move the Color class to the utils module.

Author: GraylinKim

sc2reader/objects.py

@@ -13,16 +13,6 @@
 ColorData = namedtuple('ColorData',['a','r','g','b'])
 BnetData = namedtuple('BnetData',['unknown1','unknown2','subregion','uid'])
 
-class Color(AttributeDict):
-    @property
-    def hex(self):
-        return "{0.r:02X}{0.g:02X}{0.b:02X}".format(self)
-
-    def __str__(self):
-        if not hasattr(self,'name'):
-            self.name = COLOR_CODES[self.hex]
-        return self.name
-
 class Team(object):
     """
     The team object primarily a container object for organizing :class:`Player`

sc2reader/replay.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from collections import defaultdict
 from sc2reader.constants import REGIONS, LOCALIZED_RACES
-from sc2reader.objects import Player, Color, Observer, Team
+from sc2reader.objects import Player, Observer, Team
 
 from sc2reader import utils
 
@@ -250,7 +250,7 @@ def load_players(self):
             #   color_rgba is the color object itself
             #   color_hex is color.hex
             #   color is str(color)
-            player.color = Color(**pdata.color._asdict())
+            player.color = utils.Color(**pdata.color._asdict())
 
             # Each player can be referenced in a number of different ways,
             # primarily for convenience of access in any given situation.

sc2reader/utils.py

@@ -543,6 +543,16 @@ def __setattr__(self, name, value):
     def copy(self):
         return AttributeDict(super(AttributeDict,self).copy())
 
+class Color(AttributeDict):
+    @property
+    def hex(self):
+        return "{0.r:02X}{0.g:02X}{0.b:02X}".format(self)
+
+    def __str__(self):
+        if not hasattr(self,'name'):
+            self.name = COLOR_CODES[self.hex]
+        return self.name
+
 def open_archive(replay_file):
     # Don't read the listfile because some replays have corrupted listfiles
     # due  to tampering by 3rd parties.