Adds type and code information to ReadErrors.

Also removes the now unused ParseError exception.

Author: GraylinKim

sc2reader/exceptions.py

@@ -8,7 +8,7 @@ class MutipleMatchingFilesError(SC2ReaderError):
     pass
 
 class ReadError(SC2ReaderError):
-    def __init__(self, msg, replay=None,  game_events=[], buffer=None, location=None):
+    def __init__(self, msg, type, code, location, replay=None,  game_events=[], buffer=None):
         self.__dict__.update(locals())
         super(ReadError, self).__init__(msg)
 
@@ -17,19 +17,3 @@ class ProcessError(SC2ReaderError):
 
 class FileError(SC2ReaderError):
     pass
-
-
-class ParseError(Exception):
-    def __init__(self, message, replay, event, bytes):
-        self.message = message
-        self.replay = replay
-        self.event = event
-        self.bytes = bytes
-
-    def __str__(self):
-        return """ParseError %s
-            %s - %s
-            %s""" % (self.message, self.event.type, self.event.code, self.bytes)
-
-    def __repr__(self):
-        return str(self)

sc2reader/readers.py

@@ -231,15 +231,13 @@ def __call__(self, buffer, replay):
                 # If the type is not a key in the PARSERS lookup table we
                 # probably incorrectly parsed the previous event
                 # TODO: Raise an error instead an store the previous event
-                msg = "Unknown event type: {0:X} - {1:X} at {2:X}".format(type, code, start)
-                raise exceptions.ReadError(msg, replay, game_events, buffer, start)
+                raise exceptions.ReadError("Unknown event type", type, code, start, replay, game_events, buffer)
 
             except TypeError:
                 # For some reason, the type handler that we delegated to didn't
                 # recognize the event code that we extracated.
                 # TODO: Do something meaningful here
-                msg = "Unknown event code: {0:X} - {1:X} at {2:X}".format(type, code, start)
-                raise exceptions.ReadError(msg, replay, game_events, buffer, start)
+                raise exceptions.ReadError("Unknown event code", type, code, start, replay, game_events, buffer)
 
             except exceptions.ReadError as e:
                 raise exceptions.ReadError(e.msg, replay, game_events, buffer, start)