Fix instances of empty strings in __init__

Should partially fix #460
This commit is contained in:
Jacob Bom 2016-12-30 13:57:59 +01:00
parent 48bcc3129a
commit 232a0b0286
11 changed files with 35 additions and 23 deletions

View file

@ -46,9 +46,9 @@ class Audio(TelegramObject):
def __init__(self,
file_id,
duration,
performer='',
title='',
mime_type='',
performer=None,
title=None,
mime_type=None,
file_size=0,
**kwargs):
# Required
@ -57,7 +57,8 @@ class Audio(TelegramObject):
# Optionals
self.performer = performer
self.title = title
self.mime_type = str(mime_type)
if mime_type:
self.mime_type = str(mime_type)
self.file_size = int(file_size)
@staticmethod

View file

@ -53,10 +53,10 @@ class Chat(TelegramObject):
def __init__(self,
id,
type,
title='',
username='',
first_name='',
last_name='',
title=None,
username=None,
first_name=None,
last_name=None,
all_members_are_admins=False,
bot=None,
**kwargs):

View file

@ -39,7 +39,7 @@ class Contact(TelegramObject):
"""
def __init__(self, phone_number, first_name, last_name='', user_id=0, **kwargs):
def __init__(self, phone_number, first_name, last_name=None, user_id=0, **kwargs):
# Required
self.phone_number = str(phone_number)
self.first_name = first_name

View file

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

View file

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

View file

@ -48,7 +48,7 @@ class Game(TelegramObject):
title,
description,
photo,
text='',
text=None,
text_entities=None,
animation=None,
**kwargs):

View file

@ -117,7 +117,7 @@ class Message(TelegramObject):
forward_date=None,
reply_to_message=None,
edit_date=None,
text='',
text=None,
entities=None,
audio=None,
document=None,
@ -125,13 +125,13 @@ class Message(TelegramObject):
sticker=None,
video=None,
voice=None,
caption='',
caption=None,
contact=None,
location=None,
venue=None,
new_chat_member=None,
left_chat_member=None,
new_chat_title='',
new_chat_title=None,
new_chat_photo=None,
delete_chat_photo=False,
group_chat_created=False,

View file

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

View file

@ -44,7 +44,14 @@ class User(TelegramObject):
bot (Optional[Bot]): The Bot to use for instance methods
"""
def __init__(self, id, first_name, type='', last_name='', username='', bot=None, **kwargs):
def __init__(self,
id,
first_name,
type=None,
last_name=None,
username=None,
bot=None,
**kwargs):
# Required
self.id = int(id)
self.first_name = first_name

View file

@ -52,7 +52,7 @@ class Video(TelegramObject):
height,
duration,
thumb=None,
mime_type='',
mime_type=None,
file_size=0,
**kwargs):
# Required
@ -62,7 +62,8 @@ class Video(TelegramObject):
self.duration = int(duration)
# Optionals
self.thumb = thumb
self.mime_type = str(mime_type)
if mime_type:
self.mime_type = str(mime_type)
self.file_size = int(file_size)
@staticmethod

View file

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