mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Merge pull request #937 from Badiboy/master

Browse Source 
Bugfix and DISABLE_KEYLEN_ERROR
This commit is contained in:
Badiboy 2020-08-04 12:40:32 +03:00 committed by GitHub
commit 58c4010155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telebot/apihelper.py
View File

@ -11,7 +11,6 @@ from requests.exceptions import HTTPError, ConnectionError, Timeout
try:
from requests.packages.urllib3 import fields
format_header_param = fields.format_header_param
except ImportError:
format_header_param = None
@ -130,7 +129,7 @@ def _check_result(method_name, result):
raise ApiInvalidJSONException(method_name, result)
if not result_json['ok']:
raise ApiTelegramException(msg, method_name, result, result_json)
raise ApiTelegramException(method_name, result, result_json)
return result_json

9
telebot/types.py
View File

@ -11,8 +11,11 @@ import six
from telebot import util
DISABLE_KEYLEN_ERROR = False
logger = logging.getLogger('TeleBot')
class JsonSerializable(object):
"""
Subclasses of this class are guaranteed to be able to be converted to JSON format.
@ -813,7 +816,8 @@ class ReplyKeyboardMarkup(JsonSerializable):
def __init__(self, resize_keyboard=None, one_time_keyboard=None, selective=None, row_width=3):
if row_width > self.max_row_keys:
# Todo: Will be replaced with Exception in future releases
logger.error('Telegram does not support reply keyboard row width over %d.' % self.max_row_keys)
if not DISABLE_KEYLEN_ERROR:
logger.error('Telegram does not support reply keyboard row width over %d.' % self.max_row_keys)
row_width = self.max_row_keys
self.resize_keyboard = resize_keyboard
@ -839,7 +843,8 @@ class ReplyKeyboardMarkup(JsonSerializable):
if row_width > self.max_row_keys:
# Todo: Will be replaced with Exception in future releases
logger.error('Telegram does not support reply keyboard row width over %d.' % self.max_row_keys)
if not DISABLE_KEYLEN_ERROR:
logger.error('Telegram does not support reply keyboard row width over %d.' % self.max_row_keys)
row_width = self.max_row_keys
for row in util.chunks(args, row_width):