Remove PersonDict and AttributeDict implementations.

Author: GraylinKim

sc2reader/factories/plugins/replay.py

@@ -123,7 +123,7 @@ def APMTracker(replay):
 
 @plugin
 def SelectionTracker(replay):
-    debug = replay.opt.debug
+    debug = replay.opt['debug']
     logger = log_utils.get_logger(SelectionTracker)
 
     for person in replay.entities:

sc2reader/factories/sc2factory.py

@@ -156,7 +156,7 @@ def _get_plugins(self, cls):
         return plugins
 
     def _get_options(self, cls, **new_options):
-        options = utils.AttributeDict()
+        options = dict()
         for opt_cls, cls_options in self.options.items():
             if issubclass(cls, opt_cls):
                 options.update(cls_options)
@@ -175,7 +175,7 @@ def _load_resources(self, resources, options=None, **new_options):
             yield self._load_resource(resource, options=options)
 
     def load_remote_resource_contents(self, resource, **options):
-        self.logger.info("Fetching remote resource: "+resource)
+        self.logger.info("Fetching remote resource: " + resource)
         return urlopen(resource).read()
 
     def load_local_resource_contents(self, location, **options):

sc2reader/readers.py

@@ -297,7 +297,7 @@ def __call__(self, data, replay):
 
         # method short cuts, avoid dict lookups
         EVENT_DISPATCH = self.EVENT_DISPATCH
-        debug = replay.opt.debug
+        debug = replay.opt['debug']
         tell = data.tell
         read_frames = data.read_frames
         read_bits = data.read_bits

sc2reader/resources.py

@@ -23,7 +23,7 @@
 class Resource(object):
     def __init__(self, file_object, filename=None, factory=None, **options):
         self.factory = factory
-        self.opt = utils.AttributeDict(options)
+        self.opt = options
         self.logger = log_utils.get_logger(self.__class__)
         self.filename = filename or getattr(file_object, 'name', 'Unavailable')
 
@@ -137,7 +137,7 @@ class Replay(Resource):
 
     #: A dual key dict mapping player names and numbers to
     #: :class:`Player` objects
-    player = utils.PersonDict()
+    player = dict()
 
     #: A list of :class:`Observer` objects from the game
     observers = list()
@@ -148,7 +148,7 @@ class Replay(Resource):
 
     #: A dual key dict mapping :class:`Person` object to their
     #: person id's and names
-    person = utils.PersonDict()
+    person = dict()
 
     #: A list of :class:`Person` objects from the game representing
     #: only the human players from the :attr:`people` list
@@ -214,11 +214,11 @@ def __init__(self, replay_file, filename=None, load_level=4, engine=sc2reader.en
         self.events = list()
         self.teams, self.team = list(), dict()
 
-        self.player = utils.PersonDict()
-        self.observer = utils.PersonDict()
-        self.human = utils.PersonDict()
-        self.computer = utils.PersonDict()
-        self.entity = utils.PersonDict()
+        self.player = dict()
+        self.observer = dict()
+        self.human = dict()
+        self.computer = dict()
+        self.entity = dict()
 
         self.players = list()
         self.observers = list()  # Unordered list of Observer
@@ -599,7 +599,7 @@ def _read_data(self, data_file, reader):
         data = utils.extract_data_file(data_file, self.archive)
         if data:
             self.raw_data[data_file] = reader(data, self)
-        elif self.opt.debug and data_file not in ['replay.message.events', 'replay.tracker.events']:
+        elif self.opt['debug'] and data_file not in ['replay.message.events', 'replay.tracker.events']:
             raise ValueError("{0} not found in archive".format(data_file))
 
     def __getstate__(self):
@@ -862,7 +862,7 @@ def load_translations(self):
         self.lang_sheets = dict()
         self.translations = dict()
         for lang, files in self.localization_urls.items():
-            if lang != self.opt.lang:
+            if lang != self.opt['lang']:
                 continue
 
             sheets = list()
@@ -873,17 +873,17 @@ def load_translations(self):
             for uid, (sheet, item) in self.id_map.items():
                 if sheet < len(sheets) and item in sheets[sheet]:
                     translation[uid] = sheets[sheet][item]
-                elif self.opt.debug:
+                elif self.opt['debug']:
                     msg = "No {0} translation for sheet {1}, item {2}"
-                    raise SC2ReaderLocalizationError(msg.format(self.opt.lang, sheet, item))
+                    raise SC2ReaderLocalizationError(msg.format(self.opt['lang'], sheet, item))
                 else:
                     translation[uid] = "Unknown"
 
             self.lang_sheets[lang] = sheets
             self.translations[lang] = translation
 
     def load_map_info(self):
-        map_strings = self.lang_sheets[self.opt.lang][-1]
+        map_strings = self.lang_sheets[self.opt['lang']][-1]
         self.map_name = map_strings[1]
         self.map_description = map_strings[2]
         self.map_tileset = map_strings[3]
@@ -942,7 +942,7 @@ def use_property(prop, player=None):
             activated[(prop.id, player)] = use
             return use
 
-        translation = self.translations[self.opt.lang]
+        translation = self.translations[self.opt['lang']]
         for uid, prop in properties.items():
             name = translation.get(uid, "Unknown")
             if prop.is_lobby:
@@ -956,7 +956,7 @@ def use_property(prop, player=None):
                         self.player_settings[index][name] = translation[(uid, value)]
 
     def load_player_stats(self):
-        translation = self.translations[self.opt.lang]
+        translation = self.translations[self.opt['lang']]
 
         stat_items = sum([p[0] for p in self.parts[3:]], [])
 

sc2reader/utils.py

@@ -48,57 +48,11 @@ def __str__(self):
         return self.url
 
 
-class PersonDict(dict):
-    """
-    Deprecated!
-
-    Supports lookup on both the player name and player id
-
-    ::
-
-        person = PersonDict()
-        person[1] = Player(1,"ShadesofGray")
-        me = person.name("ShadesofGray")
-        del person[me.pid]
-
-    Delete is supported on the player id only
-    """
-    def __init__(self):
-        super(PersonDict, self).__init__()
-        self._key_map = dict()
-
-    def name(self, player_name):
-        """ deprecated because it is possible for multiple players to have the same name. """
-        return self[self._key_map[player_name]]
-
-    def __setitem__(self, key, value):
-        self._key_map[value.name] = key
-        super(PersonDict, self).__setitem__(key, value)
-
-
 def windows_to_unix(windows_time):
     # This windows timestamp measures the number of 100 nanosecond periods since
     # January 1st, 1601. First we subtract the number of nanosecond periods from
     # 1601-1970, then we divide by 10^7 to bring it back to seconds.
-    return int((windows_time-116444735995904000)/10**7)
-
-
-class AttributeDict(dict):
-    """
-    Support access to dictionary items via the dot syntax as though they
-    were class attributes. Also support setting new keys via dot syntax.
-    """
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError:
-            raise AttributeError('No such attribute {0}'.format(name))
-
-    def __setattr__(self, name, value):
-        self[name] = value
-
-    def copy(self):
-        return AttributeDict(self.items())
+    return int((windows_time - 116444735995904000) / 10 ** 7)
 
 
 @loggable
@@ -252,12 +206,12 @@ class Length(timedelta):
     @property
     def hours(self):
         """ The number of hours in represented. """
-        return self.seconds//3600
+        return self.seconds // 3600
 
     @property
     def mins(self):
         """ The number of minutes in excess of the hours. """
-        return self.seconds//60 % 60
+        return self.seconds // 60 % 60
 
     @property
     def secs(self):