Skip to content

Commit e69e99c

Browse files
jsmnbomjsmnbom
committed
Make everything default to None
This effectively removes most type checking from all optional variables... I'm not really sure that's what we want...
1 parent 27b2fd6 commit e69e99c

11 files changed

Lines changed: 34 additions & 22 deletions

File tree

‎telegram/animation.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ class Animation(TelegramObject):
3535
3636
"""
3737

38-
def __init__(self, file_id, thumb=None, file_name=None, mime_type=None, file_size=0, **kwargs):
38+
def __init__(self,
39+
file_id,
40+
thumb=None,
41+
file_name=None,
42+
mime_type=None,
43+
file_size=None,
44+
**kwargs):
3945
self.file_id = file_id
4046
self.thumb = thumb
4147
self.file_name = file_name

‎telegram/audio.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __init__(self,
4949
performer=None,
5050
title=None,
5151
mime_type=None,
52-
file_size=0,
52+
file_size=None,
5353
**kwargs):
5454
# Required
5555
self.file_id = str(file_id)
@@ -58,7 +58,7 @@ def __init__(self,
5858
self.performer = performer
5959
self.title = title
6060
self.mime_type = mime_type
61-
self.file_size = int(file_size)
61+
self.file_size = file_size
6262

6363
@staticmethod
6464
def de_json(data, bot):

‎telegram/chat.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self,
5757
username=None,
5858
first_name=None,
5959
last_name=None,
60-
all_members_are_admins=False,
60+
all_members_are_admins=None,
6161
bot=None,
6262
**kwargs):
6363
# Required

‎telegram/contact.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ class Contact(TelegramObject):
3939
4040
"""
4141

42-
def __init__(self, phone_number, first_name, last_name=None, user_id=0, **kwargs):
42+
def __init__(self, phone_number, first_name, last_name=None, user_id=None, **kwargs):
4343
# Required
4444
self.phone_number = str(phone_number)
4545
self.first_name = first_name
4646
# Optionals
4747
self.last_name = last_name
48-
self.user_id = int(user_id)
48+
self.user_id = user_id
4949

5050
@staticmethod
5151
def de_json(data, bot):

‎telegram/document.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,20 @@ class Document(TelegramObject):
4141
4242
"""
4343

44-
def __init__(self, file_id, thumb=None, file_name=None, mime_type=None, file_size=0, **kwargs):
44+
def __init__(self,
45+
file_id,
46+
thumb=None,
47+
file_name=None,
48+
mime_type=None,
49+
file_size=None,
50+
**kwargs):
4551
# Required
4652
self.file_id = str(file_id)
4753
# Optionals
4854
self.thumb = thumb
4955
self.file_name = file_name
5056
self.mime_type = mime_type
51-
self.file_size = int(file_size)
57+
self.file_size = file_size
5258

5359
@staticmethod
5460
def de_json(data, bot):

‎telegram/file.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ class File(TelegramObject):
4040
4141
"""
4242

43-
def __init__(self, file_id, bot, file_size=0, file_path=None, **kwargs):
43+
def __init__(self, file_id, bot, file_size=None, file_path=None, **kwargs):
4444
# Required
4545
self.file_id = str(file_id)
4646

4747
# Optionals
48-
self.file_size = int(file_size)
48+
self.file_size = file_size
4949
if file_path:
5050
self.file_path = str(file_path)
5151

‎telegram/message.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ def __init__(self,
136136
delete_chat_photo=False,
137137
group_chat_created=False,
138138
supergroup_chat_created=False,
139-
migrate_to_chat_id=0,
140-
migrate_from_chat_id=0,
139+
migrate_to_chat_id=None,
140+
migrate_from_chat_id=None,
141141
channel_chat_created=False,
142142
pinned_message=None,
143143
forward_from_message_id=None,
@@ -174,8 +174,8 @@ def __init__(self,
174174
self.delete_chat_photo = bool(delete_chat_photo)
175175
self.group_chat_created = bool(group_chat_created)
176176
self.supergroup_chat_created = bool(supergroup_chat_created)
177-
self.migrate_to_chat_id = int(migrate_to_chat_id)
178-
self.migrate_from_chat_id = int(migrate_from_chat_id)
177+
self.migrate_to_chat_id = migrate_to_chat_id
178+
self.migrate_from_chat_id = migrate_from_chat_id
179179
self.channel_chat_created = bool(channel_chat_created)
180180
self.pinned_message = pinned_message
181181
self.forward_from_message_id = forward_from_message_id

‎telegram/photosize.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ class PhotoSize(TelegramObject):
4040
file_size (Optional[int]):
4141
"""
4242

43-
def __init__(self, file_id, width, height, file_size=0, **kwargs):
43+
def __init__(self, file_id, width, height, file_size=None, **kwargs):
4444
# Required
4545
self.file_id = str(file_id)
4646
self.width = int(width)
4747
self.height = int(height)
4848
# Optionals
49-
self.file_size = int(file_size)
49+
self.file_size = file_size
5050

5151
def __eq__(self, other):
5252
if not isinstance(other, self.__class__):

‎telegram/sticker.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class Sticker(TelegramObject):
4444
file_size (Optional[int]):
4545
"""
4646

47-
def __init__(self, file_id, width, height, thumb=None, emoji=None, file_size=0, **kwargs):
47+
def __init__(self, file_id, width, height, thumb=None, emoji=None, file_size=None, **kwargs):
4848
# Required
4949
self.file_id = str(file_id)
5050
self.width = int(width)
5151
self.height = int(height)
5252
# Optionals
5353
self.thumb = thumb
5454
self.emoji = emoji
55-
self.file_size = int(file_size)
55+
self.file_size = file_size
5656

5757
@staticmethod
5858
def de_json(data, bot):

‎telegram/video.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self,
5353
duration,
5454
thumb=None,
5555
mime_type=None,
56-
file_size=0,
56+
file_size=None,
5757
**kwargs):
5858
# Required
5959
self.file_id = str(file_id)
@@ -63,7 +63,7 @@ def __init__(self,
6363
# Optionals
6464
self.thumb = thumb
6565
self.mime_type = mime_type
66-
self.file_size = int(file_size)
66+
self.file_size = file_size
6767

6868
@staticmethod
6969
def de_json(data, bot):

0 commit comments

Comments
 (0)