TeamPGM/pyrogram
2
0
Fork 0
mirror of https://github.com/TeamPGM/pyrogram.git synced 2024-11-17 21:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into asyncio

Browse Source 
# Conflicts:
#	pyrogram/client/types/bots/callback_query.py
This commit is contained in:
Dan 2019-04-30 11:53:40 +02:00
commit f3d7cea700
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyrogram/client/types/bots/callback_query.py
View File

@ -79,7 +79,7 @@ class CallbackQuery(PyrogramType, Update):
self.chat_instance = chat_instance self.chat_instance = chat_instance
self.message = message self.message = message
self.inline_message_id = inline_message_id self.inline_message_id = inline_message_id
self.data: str = str(data, "utf-8") self.data = str(data, "utf-8")
self.game_short_name = game_short_name self.game_short_name = game_short_name
@staticmethod @staticmethod

2
pyrogram/client/types/bots/inline_keyboard_button.py
View File

@ -17,6 +17,8 @@
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
from typing import Union from typing import Union
from typing import Union
from pyrogram.api.types import ( from pyrogram.api.types import (
KeyboardButtonUrl, KeyboardButtonCallback, KeyboardButtonUrl, KeyboardButtonCallback,
KeyboardButtonSwitchInline, KeyboardButtonGame KeyboardButtonSwitchInline, KeyboardButtonGame