diff --git a/telebot/__init__.py b/telebot/__init__.py index ac54d20..ca6de4c 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -54,7 +54,7 @@ class TeleBot: def __notify_update(self, new_messages): for listener in self.update_listener: - t = threading.Thread(target=listener, args=(new_messages)) + t = threading.Thread(target=listener, args=new_messages) t.start() def polling(self, interval=3): diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 0444c4c..c381e8b 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -86,7 +86,8 @@ def send_location(token, chat_id, latitude, longitude, reply_to_message_id=None, req = requests.get(request_url, params=payload) return check_result(method_url, req) -def send_chat_action(token,chat_id,action): + +def send_chat_action(token, chat_id, action): api_url = telebot.API_URL method_url = r'sendChatAction' request_url = api_url + 'bot' + token + '/' + method_url @@ -94,6 +95,7 @@ def send_chat_action(token,chat_id,action): req = requests.get(request_url, params=payload) return check_result(method_url, req) + def send_data(token, chat_id, data, data_type, reply_to_message_id=None, reply_markup=None): api_url = telebot.API_URL method_url = get_method_by_type(data_type) diff --git a/telebot/types.py b/telebot/types.py index 872732c..efba253 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -62,7 +62,7 @@ class Message: def de_json(cls, json_string): obj = json.loads(json_string) message_id = obj['message_id'] - fromUser = User.de_json(json.dumps(obj['from'])) + from_user = User.de_json(json.dumps(obj['from'])) chat = Message.parse_chat(obj['chat']) date = obj['date'] content_type = None @@ -88,7 +88,7 @@ class Message: if 'location' in obj: opts['location'] = Location.de_json(json.dumps(obj['location'])) content_type = 'location' - return Message(message_id, fromUser, date, chat, content_type, opts) + return Message(message_id, from_user, date, chat, content_type, opts) @classmethod def parse_chat(cls, chat): @@ -262,7 +262,7 @@ class UserProfilePhotos: class ReplyKeyboardMarkup: - def __init__(self, keyboard=[], resize_keyboard=None, one_time_keyboard=None, selective=None, row_width=3): + def __init__(self, resize_keyboard=None, one_time_keyboard=None, selective=None, row_width=3): self.resize_keyboard = resize_keyboard self.one_time_keyboard = one_time_keyboard self.selective = selective @@ -307,15 +307,14 @@ class ReplyKeyboardMarkup: https://core.telegram.org/bots/api#replykeyboardmarkup :return: """ - json_dict = {} - json_dict['keyboard'] = self.keyboard - if self.one_time_keyboard != False: + json_dict = {'keyboard': self.keyboard} + if self.one_time_keyboard: json_dict['one_time_keyboard'] = True - if self.resize_keyboard != False: + if self.resize_keyboard: json_dict['resize_keyboard'] = True - if self.selective != False: + if self.selective: json_dict['selective'] = True return json.dumps(json_dict) diff --git a/tests/test_types.py b/tests/test_types.py index cb5887e..e548145 100644 --- a/tests/test_types.py +++ b/tests/test_types.py @@ -34,7 +34,7 @@ def test_json_GroupChat(): def test_json_Document(): json_string = r'{"file_name":"Text File","thumb":{},"file_id":"BQADBQADMwIAAsYifgZ_CEh0u682xwI","file_size":446}' doc = types.Document.de_json(json_string) - assert doc.thumb == None + assert doc.thumb is None assert doc.file_name == 'Text File'