Davte/davtelepot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typos and whitespace

Browse Source
This commit is contained in:
Davte 2020-04-26 16:17:09 +02:00
parent 212094bbb0
commit 96820b29c7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
davtelepot/api.py
View File

@ -1,7 +1,7 @@
"""This module provides a glow-like middleware for Telegram bot API. """This module provides a glow-like middleware for Telegram bot API.
All methods and parameters are the same as the original json API. All methods and parameters are the same as the original json API.
A simple aiohttp asyncronous web client is used to make requests. A simple aiohttp asynchronous web client is used to make requests.
""" """
# Standard library modules # Standard library modules
@ -18,6 +18,7 @@ from aiohttp import web
class TelegramError(Exception): class TelegramError(Exception):
"""Telegram API exceptions class.""" """Telegram API exceptions class."""
# noinspection PyUnusedLocal
def __init__(self, error_code=0, description=None, ok=False, def __init__(self, error_code=0, description=None, ok=False,
*args, **kwargs): *args, **kwargs):
"""Get an error response and return corresponding Exception.""" """Get an error response and return corresponding Exception."""
@ -68,12 +69,13 @@ class TelegramBot:
self._token = token self._token = token
self.sessions = dict() self.sessions = dict()
self._flood_wait = 0 self._flood_wait = 0
# Each `telegram_id` key has a list of `datetime.datetime` as value
self.last_sending_time = { self.last_sending_time = {
'absolute': ( 'absolute': (
datetime.datetime.now() datetime.datetime.now()
- self.absolute_cooldown_timedelta - self.absolute_cooldown_timedelta
), ),
0: [] # Each `telegram_id` key has a list of `datetime.datetime` as value 0: []
} }
@property @property
@ -144,7 +146,7 @@ class TelegramBot:
@staticmethod @staticmethod
def adapt_parameters(parameters, exclude=None): def adapt_parameters(parameters, exclude=None):
"""Build a aiohttp.FormData object from given `paramters`. """Build a aiohttp.FormData object from given `parameters`.
Exclude `self`, empty values and parameters in `exclude` list. Exclude `self`, empty values and parameters in `exclude` list.
Cast integers to string to avoid TypeError during json serialization. Cast integers to string to avoid TypeError during json serialization.
@ -152,7 +154,7 @@ class TelegramBot:
if exclude is None: if exclude is None:
exclude = [] exclude = []
exclude.append('self') exclude.append('self')
# quote_fields must be set to False, otherwise some file names cause troubles # quote_fields=False, otherwise some file names cause troubles
data = aiohttp.FormData(quote_fields=False) data = aiohttp.FormData(quote_fields=False)
for key, value in parameters.items(): for key, value in parameters.items():
if not (key in exclude or value is None): if not (key in exclude or value is None):
@ -279,7 +281,7 @@ class TelegramBot:
parameters = {} parameters = {}
response_object = None response_object = None
session, session_must_be_closed = self.get_session(method) session, session_must_be_closed = self.get_session(method)
# Prevent Telegram flood control for all methodsd having a `chat_id` # Prevent Telegram flood control for all methods having a `chat_id`
if 'chat_id' in parameters: if 'chat_id' in parameters:
await self.prevent_flooding(parameters['chat_id']) await self.prevent_flooding(parameters['chat_id'])
parameters = self.adapt_parameters(parameters, exclude=exclude) parameters = self.adapt_parameters(parameters, exclude=exclude)
@ -316,7 +318,7 @@ class TelegramBot:
except asyncio.TimeoutError as e: except asyncio.TimeoutError as e:
logging.info(f"{e}: {method} API call timed out") logging.info(f"{e}: {method} API call timed out")
except Exception as e: except Exception as e:
logging.info(f"Unexpected eception:\n{e}") logging.info(f"Unexpected exception:\n{e}")
response_object = e response_object = e
finally: finally:
if session_must_be_closed and not session.closed: if session_must_be_closed and not session.closed:
@ -1075,7 +1077,7 @@ class TelegramBot:
disable_notification=None, disable_notification=None,
reply_to_message_id=None, reply_to_message_id=None,
reply_markup=None): reply_markup=None):
"""Send .webp stickers. """Send `.webp` stickers.
On success, the sent Message is returned. On success, the sent Message is returned.
See https://core.telegram.org/bots/api#sendsticker for details. See https://core.telegram.org/bots/api#sendsticker for details.