OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-16 12:25:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make everything default to None

Browse source 
This effectively removes most type checking from all optional variables... I'm not really sure that's what we want...
This commit is contained in:
Jacob Bom 2017-01-11 19:41:39 +01:00
parent 27b2fd64b7
commit e69e99ce23
11 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
telegram/animation.py
View file

@ -35,7 +35,13 @@ class Animation(TelegramObject):
"""
def __init__(self, file_id, thumb=None, file_name=None, mime_type=None, file_size=0, **kwargs):
def __init__(self,
file_id,
thumb=None,
file_name=None,
mime_type=None,
file_size=None,
**kwargs):
self.file_id = file_id
self.thumb = thumb
self.file_name = file_name

4
telegram/audio.py
View file

@ -49,7 +49,7 @@ class Audio(TelegramObject):
performer=None,
title=None,
mime_type=None,
file_size=0,
file_size=None,
**kwargs):
# Required
self.file_id = str(file_id)
@ -58,7 +58,7 @@ class Audio(TelegramObject):
self.performer = performer
self.title = title
self.mime_type = mime_type
self.file_size = int(file_size)
self.file_size = file_size
@staticmethod
def de_json(data, bot):

2
telegram/chat.py
View file

@ -57,7 +57,7 @@ class Chat(TelegramObject):
username=None,
first_name=None,
last_name=None,
all_members_are_admins=False,
all_members_are_admins=None,
bot=None,
**kwargs):
# Required

4
telegram/contact.py
View file

@ -39,13 +39,13 @@ class Contact(TelegramObject):
"""
def __init__(self, phone_number, first_name, last_name=None, user_id=0, **kwargs):
def __init__(self, phone_number, first_name, last_name=None, user_id=None, **kwargs):
# Required
self.phone_number = str(phone_number)
self.first_name = first_name
# Optionals
self.last_name = last_name
self.user_id = int(user_id)
self.user_id = user_id
@staticmethod
def de_json(data, bot):

10
telegram/document.py
View file

@ -41,14 +41,20 @@ class Document(TelegramObject):
"""
def __init__(self, file_id, thumb=None, file_name=None, mime_type=None, file_size=0, **kwargs):
def __init__(self,
file_id,
thumb=None,
file_name=None,
mime_type=None,
file_size=None,
**kwargs):
# Required
self.file_id = str(file_id)
# Optionals
self.thumb = thumb
self.file_name = file_name
self.mime_type = mime_type
self.file_size = int(file_size)
self.file_size = file_size
@staticmethod
def de_json(data, bot):

4
telegram/file.py
View file

@ -40,12 +40,12 @@ class File(TelegramObject):
"""
def __init__(self, file_id, bot, file_size=0, file_path=None, **kwargs):
def __init__(self, file_id, bot, file_size=None, file_path=None, **kwargs):
# Required
self.file_id = str(file_id)
# Optionals
self.file_size = int(file_size)
self.file_size = file_size
if file_path:
self.file_path = str(file_path)

8
telegram/message.py
View file

@ -136,8 +136,8 @@ class Message(TelegramObject):
delete_chat_photo=False,
group_chat_created=False,
supergroup_chat_created=False,
migrate_to_chat_id=0,
migrate_from_chat_id=0,
migrate_to_chat_id=None,
migrate_from_chat_id=None,
channel_chat_created=False,
pinned_message=None,
forward_from_message_id=None,
@ -174,8 +174,8 @@ class Message(TelegramObject):
self.delete_chat_photo = bool(delete_chat_photo)
self.group_chat_created = bool(group_chat_created)
self.supergroup_chat_created = bool(supergroup_chat_created)
self.migrate_to_chat_id = int(migrate_to_chat_id)
self.migrate_from_chat_id = int(migrate_from_chat_id)
self.migrate_to_chat_id = migrate_to_chat_id
self.migrate_from_chat_id = migrate_from_chat_id
self.channel_chat_created = bool(channel_chat_created)
self.pinned_message = pinned_message
self.forward_from_message_id = forward_from_message_id

4
telegram/photosize.py
View file

@ -40,13 +40,13 @@ class PhotoSize(TelegramObject):
file_size (Optional[int]):
"""
def __init__(self, file_id, width, height, file_size=0, **kwargs):
def __init__(self, file_id, width, height, file_size=None, **kwargs):
# Required
self.file_id = str(file_id)
self.width = int(width)
self.height = int(height)
# Optionals
self.file_size = int(file_size)
self.file_size = file_size
def __eq__(self, other):
if not isinstance(other, self.__class__):

4
telegram/sticker.py
View file

@ -44,7 +44,7 @@ class Sticker(TelegramObject):
file_size (Optional[int]):
"""
def __init__(self, file_id, width, height, thumb=None, emoji=None, file_size=0, **kwargs):
def __init__(self, file_id, width, height, thumb=None, emoji=None, file_size=None, **kwargs):
# Required
self.file_id = str(file_id)
self.width = int(width)
@ -52,7 +52,7 @@ class Sticker(TelegramObject):
# Optionals
self.thumb = thumb
self.emoji = emoji
self.file_size = int(file_size)
self.file_size = file_size
@staticmethod
def de_json(data, bot):

4
telegram/video.py
View file

@ -53,7 +53,7 @@ class Video(TelegramObject):
duration,
thumb=None,
mime_type=None,
file_size=0,
file_size=None,
**kwargs):
# Required
self.file_id = str(file_id)
@ -63,7 +63,7 @@ class Video(TelegramObject):
# Optionals
self.thumb = thumb
self.mime_type = mime_type
self.file_size = int(file_size)
self.file_size = file_size
@staticmethod
def de_json(data, bot):

4
telegram/voice.py
View file

@ -40,13 +40,13 @@ class Voice(TelegramObject):
file_size (Optional[int]):
"""
def __init__(self, file_id, duration, mime_type=None, file_size=0, **kwargs):
def __init__(self, file_id, duration, mime_type=None, file_size=None, **kwargs):
# Required
self.file_id = str(file_id)
self.duration = int(duration)
# Optionals
self.mime_type = mime_type
self.file_size = int(file_size)
self.file_size = file_size
@staticmethod
def de_json(data, bot):