From f547cab7109635e663585a0704eb3b06f194a2d0 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 29 Nov 2016 18:27:48 -0500 Subject: klippy: No need to define __str__ and __init__ methods on exception classes The base Exception class already defines these methods. Signed-off-by: Kevin O'Connor --- klippy/homing.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'klippy/homing.py') diff --git a/klippy/homing.py b/klippy/homing.py index 4d5ab505..384da3dd 100644 --- a/klippy/homing.py +++ b/klippy/homing.py @@ -78,7 +78,7 @@ class Homing: try: if es.check_busy(self.eventtime): return True - except mcu.MCUError, e: + except mcu.error, e: raise EndstopError("Failed to home stepper %s: %s" % ( stepper.name, str(e))) post_home_pos = stepper.mcu_stepper.get_mcu_position() @@ -110,7 +110,7 @@ class QueryEndstops: try: if self.busy[0][1].check_busy(eventtime): return True - except mcu.MCUError, e: + except mcu.error, e: raise EndstopError("Failed to query endstop %s: %s" % ( self.busy[0][0], str(e))) self.busy.pop(0) @@ -125,10 +125,7 @@ class QueryEndstops: return False class EndstopError(Exception): - def __init__(self, msg="Endstop error"): - self._msg = msg - def __str__(self): - return self._msg + pass def EndstopMoveError(pos, msg="Move out of range"): return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % ( -- cgit v1.2.3-70-g09d2