From b41330774b42e5895824b74c469a525f1c07da11 Mon Sep 17 00:00:00 2001 From: pieter Date: Thu, 2 Jul 2015 01:18:23 +0200 Subject: [PATCH] Renamed ApiError to ApiException (Subclass of Exception) --- telebot/apihelper.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/telebot/apihelper.py b/telebot/apihelper.py index fdf4258..3ec9faf 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -10,13 +10,13 @@ def _make_request(token, method_name, method='get', params=None, files=None): request_url = telebot.API_URL + 'bot' + token + '/' + method_name result = requests.request(method, request_url, params=params, files=files) if result.status_code != 200: - raise ApiError(method_name + r' error.', result) + raise ApiException(method_name + r' error.', result) try: result_json = result.json() if not result_json['ok']: - raise ApiError(method_name, ' failed, result=' + result_json) + raise ApiException(method_name, ' failed, result=' + result_json) except: - raise ApiError(method_name + r' error.', result) + raise ApiException(method_name + r' error.', result) return result_json['result'] @@ -128,7 +128,7 @@ def convert_markup(markup): return markup -class ApiError(Exception): +class ApiException(Exception): def __init__(self, message, result): - super(ApiError, self).__init__(message) + super(ApiException, self).__init__(message) self.result = result