python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-11 01:54:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from Ars2014/master

Browse source 
Fix error replacing 'to_json' by 'to_python'
This commit is contained in:
Alex Root Junior 2018-01-09 20:48:06 +02:00 • committed by GitHub
commit 1decd0c2ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/types/inline_keyboard.py
View file

@ -54,7 +54,7 @@ class InlineKeyboardMarkup(base.TelegramObject):
""" """
btn_array = [] btn_array = []
for button in args: for button in args:
btn_array.append(button.to_json()) btn_array.append(button.to_python())
self.inline_keyboard.append(btn_array) self.inline_keyboard.append(btn_array)
return self return self

4
aiogram/types/reply_keyboard.py
View file

@ -41,7 +41,7 @@ class ReplyKeyboardMarkup(base.TelegramObject):
elif isinstance(button, bytes): elif isinstance(button, bytes):
row.append({'text': button.decode('utf-8')}) row.append({'text': button.decode('utf-8')})
else: else:
row.append(button.to_json()) row.append(button.to_python())
if i % self.row_width == 0: if i % self.row_width == 0:
self.keyboard.append(row) self.keyboard.append(row)
row = [] row = []
@ -55,7 +55,7 @@ class ReplyKeyboardMarkup(base.TelegramObject):
if isinstance(button, str): if isinstance(button, str):
btn_array.append({'text': button}) btn_array.append({'text': button})
else: else:
btn_array.append(button.to_json()) btn_array.append(button.to_python())
self.keyboard.append(btn_array) self.keyboard.append(btn_array)
return self return self