Skip to content

Commit a1bb695

Browse files
committed
Fix ExceptionHandler handle() method as async for async telebot
issue eternnoir#2070
1 parent bb2d8d9 commit a1bb695

3 files changed

Lines changed: 37 additions & 54 deletions

File tree

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1+
import logging
12

23
import telebot
3-
from telebot.async_telebot import AsyncTeleBot
4-
5-
6-
import logging
4+
from telebot.async_telebot import AsyncTeleBot, ExceptionHandler
75

86
logger = telebot.logger
9-
telebot.logger.setLevel(logging.DEBUG) # Outputs debug messages to console.
7+
telebot.logger.setLevel(logging.DEBUG) # Outputs debug messages to console.
108

11-
class ExceptionHandler(telebot.ExceptionHandler):
12-
def handle(self, exception):
13-
logger.error(exception)
149

15-
bot = AsyncTeleBot('TOKEN',exception_handler=ExceptionHandler())
10+
class MyExceptionHandler(ExceptionHandler):
11+
async def handle(self, exception):
12+
logger.error(exception)
1613

1714

15+
bot = AsyncTeleBot('TOKEN', exception_handler=MyExceptionHandler())
1816

1917

2018
@bot.message_handler(commands=['photo'])
2119
async def photo_send(message: telebot.types.Message):
2220
await bot.send_message(message.chat.id, 'Hi, this is an example of exception handlers.')
23-
raise Exception('test') # Exception goes to ExceptionHandler if it is set
21+
raise Exception('test') # Exception goes to ExceptionHandler if it is set
2422

2523

26-
2724
import asyncio
2825
asyncio.run(bot.polling())

‎telebot/__init__.py‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,12 @@ def polling(self, non_stop: Optional[bool]=False, skip_pending: Optional[bool]=F
10461046
self.__non_threaded_polling(non_stop=non_stop, interval=interval, timeout=timeout, long_polling_timeout=long_polling_timeout,
10471047
logger_level=logger_level, allowed_updates=allowed_updates)
10481048

1049+
def _handle_exception(self, exception: Exception) -> bool:
1050+
if self.exception_handler is None:
1051+
return False
1052+
1053+
handled = self.exception_handler.handle(exception)
1054+
return handled
10491055

10501056
def __threaded_polling(self, non_stop = False, interval = 0, timeout = None, long_polling_timeout = None,
10511057
logger_level=logging.ERROR, allowed_updates=None):
@@ -1074,10 +1080,7 @@ def __threaded_polling(self, non_stop = False, interval = 0, timeout = None, lon
10741080
self.worker_pool.raise_exceptions()
10751081
error_interval = 0.25
10761082
except apihelper.ApiException as e:
1077-
if self.exception_handler is not None:
1078-
handled = self.exception_handler.handle(e)
1079-
else:
1080-
handled = False
1083+
handled = self._handle_exception(e)
10811084
if not handled:
10821085
if logger_level and logger_level >= logging.ERROR:
10831086
logger.error("Threaded polling exception: %s", str(e))
@@ -1107,10 +1110,7 @@ def __threaded_polling(self, non_stop = False, interval = 0, timeout = None, lon
11071110
self.__stop_polling.set()
11081111
break
11091112
except Exception as e:
1110-
if self.exception_handler is not None:
1111-
handled = self.exception_handler.handle(e)
1112-
else:
1113-
handled = False
1113+
handled = self._handle_exception(e)
11141114
if not handled:
11151115
polling_thread.stop()
11161116
polling_thread.clear_exceptions() #*
@@ -1144,11 +1144,7 @@ def __non_threaded_polling(self, non_stop=False, interval=0, timeout=None, long_
11441144
self.__retrieve_updates(timeout, long_polling_timeout, allowed_updates=allowed_updates)
11451145
error_interval = 0.25
11461146
except apihelper.ApiException as e:
1147-
if self.exception_handler is not None:
1148-
handled = self.exception_handler.handle(e)
1149-
else:
1150-
handled = False
1151-
1147+
handled = self._handle_exception(e)
11521148
if not handled:
11531149
if logger_level and logger_level >= logging.ERROR:
11541150
logger.error("Polling exception: %s", str(e))
@@ -1171,10 +1167,7 @@ def __non_threaded_polling(self, non_stop=False, interval=0, timeout=None, long_
11711167
self.__stop_polling.set()
11721168
break
11731169
except Exception as e:
1174-
if self.exception_handler is not None:
1175-
handled = self.exception_handler.handle(e)
1176-
else:
1177-
handled = False
1170+
handled = self._handle_exception(e)
11781171
if not handled:
11791172
raise e
11801173
else:
@@ -1190,10 +1183,7 @@ def _exec_task(self, task, *args, **kwargs):
11901183
try:
11911184
task(*args, **kwargs)
11921185
except Exception as e:
1193-
if self.exception_handler is not None:
1194-
handled = self.exception_handler.handle(e)
1195-
else:
1196-
handled = False
1186+
handled = self._handle_exception(e)
11971187
if not handled:
11981188
raise e
11991189

@@ -6858,9 +6848,8 @@ def _run_middlewares_and_handler(self, message, handlers, middlewares, update_ty
68586848
break
68596849
except Exception as e:
68606850
handler_error = e
6861-
if self.exception_handler:
6862-
self.exception_handler.handle(e)
6863-
else:
6851+
handled = self._handle_exception(e)
6852+
if not handled:
68646853
logger.error(str(e))
68656854
logger.debug("Exception traceback:\n%s", traceback.format_exc())
68666855

‎telebot/async_telebot.py‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ExceptionHandler:
5858
"""
5959

6060
# noinspection PyMethodMayBeStatic,PyUnusedLocal
61-
def handle(self, exception):
61+
async def handle(self, exception):
6262
return False
6363

6464

@@ -368,6 +368,16 @@ async def infinity_polling(self, timeout: Optional[int]=20, skip_pending: Option
368368
if logger_level and logger_level >= logging.INFO:
369369
logger.error("Break infinity polling")
370370

371+
async def _handle_exception(self, exception: Exception) -> bool:
372+
if self.exception_handler is None:
373+
return False
374+
375+
if iscoroutinefunction(self.exception_handler.handle):
376+
handled = await self.exception_handler.handle(exception)
377+
else:
378+
handled = self.exception_handler.handle(exception) # noqa
379+
return handled
380+
371381
async def _process_polling(self, non_stop: bool=False, interval: int=0, timeout: int=20,
372382
request_timeout: int=None, allowed_updates: Optional[List[str]]=None):
373383
"""
@@ -415,11 +425,7 @@ async def _process_polling(self, non_stop: bool=False, interval: int=0, timeout:
415425
except asyncio.CancelledError:
416426
return
417427
except asyncio_helper.RequestTimeout as e:
418-
handled = False
419-
if self.exception_handler:
420-
self.exception_handler.handle(e)
421-
handled = True
422-
428+
handled = await self._handle_exception(e)
423429
if not handled:
424430
logger.error('Unhandled exception (full traceback for debug level): %s', str(e))
425431
logger.debug(traceback.format_exc())
@@ -430,11 +436,7 @@ async def _process_polling(self, non_stop: bool=False, interval: int=0, timeout:
430436
else:
431437
return
432438
except asyncio_helper.ApiException as e:
433-
handled = False
434-
if self.exception_handler:
435-
self.exception_handler.handle(e)
436-
handled = True
437-
439+
handled = await self._handle_exception(e)
438440
if not handled:
439441
logger.error('Unhandled exception (full traceback for debug level): %s', str(e))
440442
logger.debug(traceback.format_exc())
@@ -444,11 +446,7 @@ async def _process_polling(self, non_stop: bool=False, interval: int=0, timeout:
444446
else:
445447
break
446448
except Exception as e:
447-
handled = False
448-
if self.exception_handler:
449-
self.exception_handler.handle(e)
450-
handled = True
451-
449+
handled = await self._handle_exception(e)
452450
if not handled:
453451
logger.error('Unhandled exception (full traceback for debug level): %s', str(e))
454452
logger.debug(traceback.format_exc())
@@ -545,9 +543,8 @@ async def _run_middlewares_and_handlers(self, message, handlers, middlewares, up
545543
break
546544
except Exception as e:
547545
handler_error = e
548-
if self.exception_handler:
549-
self.exception_handler.handle(e)
550-
else:
546+
handled = await self._handle_exception(e)
547+
if not handled:
551548
logger.error(str(e))
552549
logger.debug("Exception traceback:\n%s", traceback.format_exc())
553550

0 commit comments

Comments
 (0)