diff options
| author | Maël Kerbiriou <m431.kerbiriou@gmail.com> | 2021-01-18 04:37:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-17 22:37:41 -0500 |
| commit | 9278f56e3685a71eea6f2ae393a7e4f32b048420 (patch) | |
| tree | 0740d1414c500ef22c7619b764a81605ef898a19 | |
| parent | 64097cb0d0e0a1e2a73f6846b48bae9b509204f1 (diff) | |
| download | kutter-9278f56e3685a71eea6f2ae393a7e4f32b048420.tar.gz kutter-9278f56e3685a71eea6f2ae393a7e4f32b048420.tar.xz kutter-9278f56e3685a71eea6f2ae393a7e4f32b048420.zip | |
webhooks: Fix use of deprecated Exception.message attribute (#3781)
Since Python 2.6, the BaseException.message attribute is deprecated (PEP-352[1])
in favor of e.args[0] or str(e). This commit replaces e.message with str(e).
[1] https://www.python.org/dev/peps/pep-0352/
Signed-off-by: Maël Kerbiriou <m431.kerbiriou@gmail.com>
| -rw-r--r-- | klippy/extras/bed_mesh.py | 4 | ||||
| -rw-r--r-- | klippy/webhooks.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/klippy/extras/bed_mesh.py b/klippy/extras/bed_mesh.py index 7afec299..e78ebaeb 100644 --- a/klippy/extras/bed_mesh.py +++ b/klippy/extras/bed_mesh.py @@ -530,7 +530,7 @@ class BedMeshCalibrate: try: z_mesh.build_mesh(probed_matrix) except BedMeshError as e: - raise self.gcode.error(e.message) + raise self.gcode.error(str(e)) self.bedmesh.set_mesh(z_mesh) self.gcode.respond_info("Mesh Bed Leveling Complete") self.bedmesh.save_profile("default") @@ -988,7 +988,7 @@ class ProfileManager: try: z_mesh.build_mesh(probed_matrix) except BedMeshError as e: - raise self.gcode.error(e.message) + raise self.gcode.error(str(e)) self.current_profile = prof_name self.bedmesh.set_mesh(z_mesh) def remove_profile(self, prof_name): diff --git a/klippy/webhooks.py b/klippy/webhooks.py index 7fffc1fe..2deed429 100644 --- a/klippy/webhooks.py +++ b/klippy/webhooks.py @@ -29,7 +29,7 @@ class WebRequestError(gcode.CommandError): def to_dict(self): return { 'error': 'WebRequestError', - 'message': self.message} + 'message': str(self)} class Sentinel: pass @@ -224,12 +224,12 @@ class ClientConnection: func = self.webhooks.get_callback(web_request.get_method()) func(web_request) except self.printer.command_error as e: - web_request.set_error(WebRequestError(e.message)) + web_request.set_error(WebRequestError(str(e))) except Exception as e: msg = ("Internal Error on WebRequest: %s" % (web_request.get_method())) logging.exception(msg) - web_request.set_error(WebRequestError(e.message)) + web_request.set_error(WebRequestError(str(e))) self.printer.invoke_shutdown(msg) result = web_request.finish() if result is None: |