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

Add ApiError exception.

Browse Source
This commit is contained in:
eternnoir 2015-06-27 21:55:45 +08:00
parent 6676f8a52a
commit 343b8ebc85
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
telebot/__init__.py
View File

@ -60,9 +60,10 @@ class TeleBot:
# over buffer size # over buffer size
if len(self.update_id_list) > self.max_message_size: if len(self.update_id_list) > self.max_message_size:
# remove oldest element. # remove oldest element.
upid = self.update_id_list[0] upid = self.update_id_list.pop()
if upid in self.update_entries: if upid in self.update_entries:
del self.update_entries[upid] del self.update_entries[upid]
self.update_entries[update_id] = message self.update_entries[update_id] = message
self.update_id_list.append(update_id) self.update_id_list.append(update_id)
@ -177,3 +178,6 @@ class TeleBot:
:return: :return:
""" """
return apihelper.send_data(self.token, chat_id, data, 'video', reply_to_message_id, reply_markup) return apihelper.send_data(self.token, chat_id, data, 'video', reply_to_message_id, reply_markup)

33
telebot/apihelper.py
View File

@ -9,7 +9,7 @@ def get_me(token):
method_url = r'getMe' method_url = r'getMe'
request_url = api_url + 'bot' + token + '/' + method_url request_url = api_url + 'bot' + token + '/' + method_url
req = requests.get(request_url) req = requests.get(request_url)
return req.json() return check_result(method_url, req)
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None): def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
@ -34,7 +34,7 @@ def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_m
if reply_markup: if reply_markup:
payload['reply_markup'] = reply_markup payload['reply_markup'] = reply_markup
req = requests.get(request_url, params=payload) req = requests.get(request_url, params=payload)
return req.json() return check_result(method_url, req)
def get_updates(token): def get_updates(token):
@ -42,7 +42,7 @@ def get_updates(token):
method_url = r'getUpdates' method_url = r'getUpdates'
request_url = api_url + 'bot' + token + '/' + method_url request_url = api_url + 'bot' + token + '/' + method_url
req = requests.get(request_url) req = requests.get(request_url)
return req.json() return check_result(method_url,req)
def forward_message(token, chat_id, from_chat_id, message_id): def forward_message(token, chat_id, from_chat_id, message_id):
@ -51,7 +51,7 @@ def forward_message(token, chat_id, from_chat_id, message_id):
request_url = api_url + 'bot' + token + '/' + method_url request_url = api_url + 'bot' + token + '/' + method_url
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id} payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
req = requests.get(request_url, params=payload) req = requests.get(request_url, params=payload)
return req.json() return check_result(method_url, req)
def send_photo(token, chat_id, photo, caption=None, reply_to_message_id=None, reply_markup=None): def send_photo(token, chat_id, photo, caption=None, reply_to_message_id=None, reply_markup=None):
@ -67,7 +67,8 @@ def send_photo(token, chat_id, photo, caption=None, reply_to_message_id=None, re
if reply_markup: if reply_markup:
payload['reply_markup'] = reply_markup payload['reply_markup'] = reply_markup
req = requests.post(request_url, params=payload, files=files) req = requests.post(request_url, params=payload, files=files)
return req.json() return check_result(method_url, req)
def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None): def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None):
api_url = telebot.API_URL api_url = telebot.API_URL
@ -80,7 +81,9 @@ def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_m
if reply_markup: if reply_markup:
payload['reply_markup'] = reply_markup payload['reply_markup'] = reply_markup
req = requests.post(request_url, params=payload, files=files) req = requests.post(request_url, params=payload, files=files)
return req.json() req.status_code
return check_result(method_url, req)
def get_method_by_type(data_type): def get_method_by_type(data_type):
if data_type == 'audio': if data_type == 'audio':
@ -91,3 +94,21 @@ def get_method_by_type(data_type):
return 'sendSticker' return 'sendSticker'
if data_type == 'video': if data_type == 'video':
return 'sendVideo' return 'sendVideo'
def check_result(func_name, result):
if result.status_code != 200:
raise ApiError(func_name + r' error.', result)
try:
result_json = result.json()
if not result_json['ok']:
raise Exception('')
except:
raise ApiError(func_name + r' error.', result)
return result_json
class ApiError(Exception):
def __init__(self, message, result):
super(ApiError, self).__init__(message)
self.result = result