Skip to content

Commit 232a0b0

Browse files
jsmnbomjsmnbom
committed
Fix instances of empty strings in __init__
Should partially fix python-telegram-bot#460
1 parent 48bcc31 commit 232a0b0

11 files changed

Lines changed: 35 additions & 23 deletions

File tree

‎telegram/audio.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ class Audio(TelegramObject):
4646
def __init__(self,
4747
file_id,
4848
duration,
49-
performer='',
50-
title='',
51-
mime_type='',
49+
performer=None,
50+
title=None,
51+
mime_type=None,
5252
file_size=0,
5353
**kwargs):
5454
# Required
@@ -57,7 +57,8 @@ def __init__(self,
5757
# Optionals
5858
self.performer = performer
5959
self.title = title
60-
self.mime_type = str(mime_type)
60+
if mime_type:
61+
self.mime_type = str(mime_type)
6162
self.file_size = int(file_size)
6263

6364
@staticmethod

‎telegram/chat.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class Chat(TelegramObject):
5353
def __init__(self,
5454
id,
5555
type,
56-
title='',
57-
username='',
58-
first_name='',
59-
last_name='',
56+
title=None,
57+
username=None,
58+
first_name=None,
59+
last_name=None,
6060
all_members_are_admins=False,
6161
bot=None,
6262
**kwargs):

‎telegram/contact.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Contact(TelegramObject):
3939
4040
"""
4141

42-
def __init__(self, phone_number, first_name, last_name='', user_id=0, **kwargs):
42+
def __init__(self, phone_number, first_name, last_name=None, user_id=0, **kwargs):
4343
# Required
4444
self.phone_number = str(phone_number)
4545
self.first_name = first_name

‎telegram/document.py‎

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

44-
def __init__(self, file_id, thumb=None, file_name='', mime_type='', file_size=0, **kwargs):
44+
def __init__(self, file_id, thumb=None, file_name=None, mime_type=None, file_size=0, **kwargs):
4545
# Required
4646
self.file_id = str(file_id)
4747
# Optionals
4848
self.thumb = thumb
4949
self.file_name = file_name
50-
self.mime_type = str(mime_type)
50+
if mime_type:
51+
self.mime_type = str(mime_type)
5152
self.file_size = int(file_size)
5253

5354
@staticmethod

‎telegram/file.py‎

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

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

4747
# Optionals
4848
self.file_size = int(file_size)
49-
self.file_path = str(file_path)
49+
if file_path:
50+
self.file_path = str(file_path)
5051

5152
self.bot = bot
5253

‎telegram/game.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self,
4848
title,
4949
description,
5050
photo,
51-
text='',
51+
text=None,
5252
text_entities=None,
5353
animation=None,
5454
**kwargs):

‎telegram/message.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,21 @@ def __init__(self,
117117
forward_date=None,
118118
reply_to_message=None,
119119
edit_date=None,
120-
text='',
120+
text=None,
121121
entities=None,
122122
audio=None,
123123
document=None,
124124
photo=None,
125125
sticker=None,
126126
video=None,
127127
voice=None,
128-
caption='',
128+
caption=None,
129129
contact=None,
130130
location=None,
131131
venue=None,
132132
new_chat_member=None,
133133
left_chat_member=None,
134-
new_chat_title='',
134+
new_chat_title=None,
135135
new_chat_photo=None,
136136
delete_chat_photo=False,
137137
group_chat_created=False,

‎telegram/sticker.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Sticker(TelegramObject):
4444
file_size (Optional[int]):
4545
"""
4646

47-
def __init__(self, file_id, width, height, thumb=None, emoji='', file_size=0, **kwargs):
47+
def __init__(self, file_id, width, height, thumb=None, emoji=None, file_size=0, **kwargs):
4848
# Required
4949
self.file_id = str(file_id)
5050
self.width = int(width)

‎telegram/user.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,14 @@ class User(TelegramObject):
4444
bot (Optional[Bot]): The Bot to use for instance methods
4545
"""
4646

47-
def __init__(self, id, first_name, type='', last_name='', username='', bot=None, **kwargs):
47+
def __init__(self,
48+
id,
49+
first_name,
50+
type=None,
51+
last_name=None,
52+
username=None,
53+
bot=None,
54+
**kwargs):
4855
# Required
4956
self.id = int(id)
5057
self.first_name = first_name

‎telegram/video.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(self,
5252
height,
5353
duration,
5454
thumb=None,
55-
mime_type='',
55+
mime_type=None,
5656
file_size=0,
5757
**kwargs):
5858
# Required
@@ -62,7 +62,8 @@ def __init__(self,
6262
self.duration = int(duration)
6363
# Optionals
6464
self.thumb = thumb
65-
self.mime_type = str(mime_type)
65+
if mime_type:
66+
self.mime_type = str(mime_type)
6667
self.file_size = int(file_size)
6768

6869
@staticmethod

0 commit comments

Comments
 (0)