Skip to content

Add kwargs to data dict #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsnoam merged 3 commits into from
Jul 24, 2017
Merged

Add kwargs to data dict #744

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0d87e9
Add kwargs to data dict
Eldinnie Jul 24, 2017
2ae9595
Copy kwargs instead of pointing to it.
tsnoam Jul 24, 2017
4cfced4
Revert "Copy kwargs instead of pointing to it."
tsnoam Jul 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions telegram/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@ def send_chat_action(self, chat_id, action, timeout=None, **kwargs):
url = '{0}/sendChatAction'.format(self.base_url)

data = {'chat_id': chat_id, 'action': action}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1047,6 +1048,8 @@ def answer_inline_query(self,
if switch_pm_parameter:
data['switch_pm_parameter'] = switch_pm_parameter

data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return result
Expand Down Expand Up @@ -1082,6 +1085,7 @@ def get_user_profile_photos(self, user_id, offset=None, limit=100, timeout=None,
data['offset'] = offset
if limit:
data['limit'] = limit
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1113,6 +1117,7 @@ def get_file(self, file_id, timeout=None, **kwargs):
url = '{0}/getFile'.format(self.base_url)

data = {'file_id': file_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1155,6 +1160,7 @@ def kick_chat_member(self, chat_id, user_id, timeout=None, until_date=None, **kw
url = '{0}/kickChatMember'.format(self.base_url)

data = {'chat_id': chat_id, 'user_id': user_id}
data.update(kwargs)

if until_date is not None:
if isinstance(until_date, datetime):
Expand Down Expand Up @@ -1191,6 +1197,7 @@ def unban_chat_member(self, chat_id, user_id, timeout=None, **kwargs):
url = '{0}/unbanChatMember'.format(self.base_url)

data = {'chat_id': chat_id, 'user_id': user_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1251,6 +1258,7 @@ def answer_callback_query(self,
data['url'] = url
if cache_time is not None:
data['cache_time'] = cache_time
data.update(kwargs)

result = self._request.post(url_, data, timeout=timeout)

Expand Down Expand Up @@ -1490,6 +1498,7 @@ def get_updates(self,
data['limit'] = limit
if allowed_updates is not None:
data['allowed_updates'] = allowed_updates
data.update(kwargs)

# Ideally we'd use an aggressive read timeout for the polling. However,
# * Short polling should return within 2 seconds.
Expand Down Expand Up @@ -1587,6 +1596,7 @@ def set_webhook(self,
data['max_connections'] = max_connections
if allowed_updates is not None:
data['allowed_updates'] = allowed_updates
data.update(kwargs)

result = self._request.post(url_, data, timeout=timeout)

Expand All @@ -1613,7 +1623,7 @@ def delete_webhook(self, timeout=None, **kwargs):

url = '{0}/deleteWebhook'.format(self.base_url)

data = {}
data = kwargs

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1642,6 +1652,7 @@ def leave_chat(self, chat_id, timeout=None, **kwargs):
url = '{0}/leaveChat'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1671,6 +1682,7 @@ def get_chat(self, chat_id, timeout=None, **kwargs):
url = '{0}/getChat'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1702,6 +1714,7 @@ def get_chat_administrators(self, chat_id, timeout=None, **kwargs):
url = '{0}/getChatAdministrators'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1730,6 +1743,7 @@ def get_chat_members_count(self, chat_id, timeout=None, **kwargs):
url = '{0}/getChatMembersCount'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1759,6 +1773,7 @@ def get_chat_member(self, chat_id, user_id, timeout=None, **kwargs):
url = '{0}/getChatMember'.format(self.base_url)

data = {'chat_id': chat_id, 'user_id': user_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand All @@ -1781,7 +1796,7 @@ def get_webhook_info(self, timeout=None, **kwargs):

url = '{0}/getWebhookInfo'.format(self.base_url)

data = {}
data = kwargs

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -1891,6 +1906,7 @@ def get_game_high_scores(self,
data['message_id'] = message_id
if inline_message_id:
data['inline_message_id'] = inline_message_id
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2061,6 +2077,7 @@ def answer_shipping_query(self,
data['shipping_options'] = [option.to_dict() for option in shipping_options]
if error_message is not None:
data['error_message'] = error_message
data.update(kwargs)

result = self._request.post(url_, data, timeout=timeout)

Expand Down Expand Up @@ -2113,6 +2130,7 @@ def answer_pre_checkout_query(self, pre_checkout_query_id, ok,

if error_message is not None:
data['error_message'] = error_message
data.update(kwargs)

result = self._request.post(url_, data, timeout=timeout)

Expand Down Expand Up @@ -2172,6 +2190,7 @@ def restrict_chat_member(self, chat_id, user_id, until_date=None, can_send_messa
data['can_send_other_messages'] = can_send_other_messages
if can_add_web_page_previews is not None:
data['can_add_web_page_previews'] = can_add_web_page_previews
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2242,6 +2261,7 @@ def promote_chat_member(self, chat_id, user_id, can_change_info=None,
data['can_pin_messages'] = can_pin_messages
if can_promote_members is not None:
data['can_promote_members'] = can_promote_members
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2271,6 +2291,7 @@ def export_chat_invite_link(self, chat_id, timeout=None, **kwargs):
url = '{0}/exportChatInviteLink'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2306,6 +2327,7 @@ def set_chat_photo(self, chat_id, photo, timeout=None, **kwargs):
url = '{0}/setChatPhoto'.format(self.base_url)

data = {'chat_id': chat_id, 'photo': photo}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2340,6 +2362,7 @@ def delete_chat_photo(self, chat_id, timeout=None, **kwargs):
url = '{0}/deleteChatPhoto'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2375,6 +2398,7 @@ def set_chat_title(self, chat_id, title, timeout=None, **kwargs):
url = '{0}/setChatTitle'.format(self.base_url)

data = {'chat_id': chat_id, 'title': title}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2405,6 +2429,7 @@ def set_chat_description(self, chat_id, description, timeout=None, **kwargs):
url = '{0}/setChatDescription'.format(self.base_url)

data = {'chat_id': chat_id, 'description': description}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2441,6 +2466,7 @@ def pin_chat_message(self, chat_id, message_id, disable_notification=None, timeo

if disable_notification is not None:
data['disable_notification'] = disable_notification
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down Expand Up @@ -2470,11 +2496,13 @@ def unpin_chat_message(self, chat_id, timeout=None, **kwargs):
url = '{0}/unpinChatMessage'.format(self.base_url)

data = {'chat_id': chat_id}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return result

@log
def get_sticker_set(self, name, timeout=None, **kwargs):
"""
Use this method to get a sticker set.
Expand All @@ -2497,11 +2525,13 @@ def get_sticker_set(self, name, timeout=None, **kwargs):
url = '{0}/getStickerSet'.format(self.base_url)

data = {'name': name}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return StickerSet.de_json(result, self)

@log
def upload_sticker_file(self, user_id, png_sticker, timeout=None, **kwargs):
"""
Use this method to upload a .png file with a sticker for later use in
Expand Down Expand Up @@ -2532,11 +2562,13 @@ def upload_sticker_file(self, user_id, png_sticker, timeout=None, **kwargs):
url = '{0}/uploadStickerFile'.format(self.base_url)

data = {'user_id': user_id, 'png_sticker': png_sticker}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return File.de_json(result, self)

@log
def create_new_sticker_set(self, user_id, name, title, png_sticker, emojis,
contains_masks=None, mask_position=None, timeout=None, **kwargs):
"""
Expand Down Expand Up @@ -2587,11 +2619,13 @@ def create_new_sticker_set(self, user_id, name, title, png_sticker, emojis,
data['contains_masks'] = contains_masks
if mask_position is not None:
data['mask_position'] = mask_position
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return result

@log
def add_sticker_to_set(self, user_id, name, png_sticker, emojis, mask_position=None,
timeout=None, **kwargs):
"""
Expand Down Expand Up @@ -2631,11 +2665,13 @@ def add_sticker_to_set(self, user_id, name, png_sticker, emojis, mask_position=N

if mask_position is not None:
data['mask_position'] = mask_position
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return result

@log
def set_sticker_position_in_set(self, sticker, position, timeout=None, **kwargs):
"""
Use this method to move a sticker in a set created by the bot to a specific position.
Expand All @@ -2657,11 +2693,13 @@ def set_sticker_position_in_set(self, sticker, position, timeout=None, **kwargs)
url = '{0}/setStickerPositionInSet'.format(self.base_url)

data = {'sticker': sticker, 'position': position}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

return result

@log
def delete_sticker_from_set(self, sticker, timeout=None, **kwargs):
"""
Use this method to delete a sticker from a set created by the bot.
Expand All @@ -2682,6 +2720,7 @@ def delete_sticker_from_set(self, sticker, timeout=None, **kwargs):
url = '{0}/deleteStickerFromSet'.format(self.base_url)

data = {'sticker': sticker}
data.update(kwargs)

result = self._request.post(url, data, timeout=timeout)

Expand Down