diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 7603d17..fa61fe6 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -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 diff --git a/telebot/types.py b/telebot/types.py index 3ea5e6e..4d35176 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -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):