3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-15 18:58:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

webhooks: Fix use of deprecated Exception.message attribute (#3781)

Browse source 
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>
This commit is contained in:
Maël Kerbiriou 2021-01-18 04:37:41 +01:00 • committed by GitHub
parent 64097cb0d0
commit 9278f56e36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
klippy/webhooks.py
View file

@ -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: