From 879dcb0a955a0de7dbd538d81c2d741e14d0a995 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 13 Feb 2020 00:23:20 +0200 Subject: [PATCH] Make RPCError subclasses unpicklable again --- telethon_generator/generators/errors.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/telethon_generator/generators/errors.py b/telethon_generator/generators/errors.py index 6f5a6021..386575be 100644 --- a/telethon_generator/generators/errors.py +++ b/telethon_generator/generators/errors.py @@ -26,13 +26,16 @@ def generate_errors(errors, f): # Error classes generation for error in errors: - f.write('\n\nclass {}({}):\n' - ' def __init__(self, **kwargs):\n' - ' '.format(error.name, error.subclass)) + f.write('\n\nclass {}({}):\n '.format(error.name, error.subclass)) if error.has_captures: - f.write("self.{} = int(kwargs.get('capture', 0))\n " + f.write('def __init__(self, request, capture=0):\n ' + ' self.request = request\n ') + f.write(' self.{} = int(capture)\n ' .format(error.capture_name)) + else: + f.write('def __init__(self, request):\n ' + ' self.request = request\n ') f.write('super(Exception, self).__init__(' '{}'.format(repr(error.description))) @@ -40,7 +43,12 @@ def generate_errors(errors, f): if error.has_captures: f.write('.format({0}=self.{0})'.format(error.capture_name)) - f.write(" + self._fmt_request(kwargs['request']))\n") + f.write(' + self._fmt_request(self.request))\n\n') + f.write(' def __reduce__(self):\n ') + if error.has_captures: + f.write('return type(self), (self.request, self.{})\n'.format(error.capture_name)) + else: + f.write('return type(self), (self.request,)\n') # Create the actual {CODE: ErrorClassName} dict once classes are defined f.write('\n\nrpc_errors_dict = {\n')