Skip to content

Commit e11a16f

Browse files
committed
Fix an issue with the way errors were raised on parse failure.
1 parent 77b358b commit e11a16f

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

sc2reader/readers.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ def get_setup_parser(self, code):
264264
if code in (0x0B, 0x0C, 0x2C): return self.parse_join_event
265265
elif code in (0x05,): return self.parse_start_event
266266
else:
267-
# TODO: Raise a better error
268-
raise ReadError("Unknown Setup Parser Code {0}".format(code))
267+
raise ParseError("Unknown Setup Parser Code {0}".format(code))
269268

270269
def get_action_parser(self, code):
271270
# The action events are always associated with a particular player and
@@ -276,8 +275,7 @@ def get_action_parser(self, code):
276275
elif code & 0x0F == 0xD: return self.parse_hotkey_event
277276
elif code & 0x0F == 0xF: return self.parse_transfer_event
278277
else:
279-
# TODO: Raise a better error
280-
raise ReadError("Unknown Action Parser Code {0}".format(code))
278+
raise ParseError("Unknown Action Parser Code {0}".format(code))
281279

282280
def get_unknown2_parser(self, code):
283281
# While its unclear what these events represent, they are MUCH more
@@ -287,8 +285,7 @@ def get_unknown2_parser(self, code):
287285
elif code == 0x07: return self.parse_0207_event
288286
elif code == 0x0E: return self.parse_020E_event
289287
else:
290-
# TODO: Raise a better error
291-
raise ReadError("Unknown Unknown2 Parser Code {0}".format(code))
288+
raise ParseError("Unknown Unknown2 Parser Code {0}".format(code))
292289

293290
def get_camera_parser(self, code):
294291
# Each player's camera control events are recorded, separately from the
@@ -300,8 +297,7 @@ def get_camera_parser(self, code):
300297
elif code & 0x0F == 1: return self.parse_cameraX1_event
301298
elif code == 0x0a: return self.parse_camera0A_event
302299
else:
303-
# TODO: Raise a better error
304-
raise ReadError("Unknown Camera Parser Code {0}".format(code))
300+
raise ParseError("Unknown Camera Parser Code {0}".format(code))
305301

306302
def get_unknown4_parser(self, code):
307303
# I don't know anything about these events. Any parse information for
@@ -316,8 +312,7 @@ def get_unknown4_parser(self, code):
316312
elif code & 0x0F == 0x02: return self.parse_04X2_event
317313
elif code & 0x0F == 0x0C: return self.parse_04XC_event
318314
else:
319-
# TODO: Raise a better error
320-
raise ReadError("Unknown Unknown4 Parser Code {0}".format(code))
315+
raise ParseError("Unknown Unknown4 Parser Code {0}".format(code))
321316

322317
# The storage format for many of the game events has changed, sometimes
323318
# dramatically, over time. To handle this inconsistency sc2reader uses mixins

0 commit comments

Comments
 (0)