From bfe5b79ad92b15d521b7c468a93f173ec5e54cdd Mon Sep 17 00:00:00 2001 From: Leandro Toledo Date: Wed, 8 Jul 2015 21:32:48 -0300 Subject: [PATCH] PEP8 --- telegram/audio.py | 19 +++++++++---------- telegram/document.py | 22 +++++++++++----------- telegram/sticker.py | 22 +++++++++++----------- telegram/video.py | 31 +++++++++++++++++-------------- 4 files changed, 48 insertions(+), 46 deletions(-) diff --git a/telegram/audio.py b/telegram/audio.py index fc082d1d0..38dbf0648 100644 --- a/telegram/audio.py +++ b/telegram/audio.py @@ -2,16 +2,15 @@ class Audio(object): - def __init__(self, **kwargs): - param_defaults = { - 'file_id': None, - 'duration': None, - 'mime_type': None, - 'file_size': None - } - - for (param, default) in param_defaults.iteritems(): - setattr(self, param, kwargs.get(param, default)) + def __init__(self, + file_id, + duration, + mime_type=None, + file_size=None): + self.file_id = file_id + self.duration = duration + self.mime_type = mime_type + self.file_size = file_size @staticmethod def de_json(data): diff --git a/telegram/document.py b/telegram/document.py index 9c99bf051..6d8f34246 100644 --- a/telegram/document.py +++ b/telegram/document.py @@ -2,17 +2,17 @@ class Document(object): - def __init__(self, **kwargs): - param_defaults = { - 'file_id': None, - 'thumb': None, - 'file_name': None, - 'mime_type': None, - 'file_size': None - } - - for (param, default) in param_defaults.iteritems(): - setattr(self, param, kwargs.get(param, default)) + def __init__(self, + file_id, + thumb, + file_name=None, + mime_type=None, + file_size=None): + self.file_id = file_id + self.thumb = thumb + self.file_name = file_name + self.mime_type = mime_type + self.file_size = file_size @staticmethod def de_json(data): diff --git a/telegram/sticker.py b/telegram/sticker.py index fd6f4934b..4f169f51b 100644 --- a/telegram/sticker.py +++ b/telegram/sticker.py @@ -2,17 +2,17 @@ class Sticker(object): - def __init__(self, **kwargs): - param_defaults = { - 'file_id': None, - 'width': None, - 'height': None, - 'thumb': None, - 'file_size': None - } - - for (param, default) in param_defaults.iteritems(): - setattr(self, param, kwargs.get(param, default)) + def __init__(self, + file_id, + width, + height, + thumb, + file_size=None): + self.file_id = file_id + self.width = width + self.height = height + self.thumb = thumb + self.file_size = file_size @staticmethod def de_json(data): diff --git a/telegram/video.py b/telegram/video.py index a34724edd..a08d09fca 100644 --- a/telegram/video.py +++ b/telegram/video.py @@ -2,20 +2,23 @@ class Video(object): - def __init__(self, **kwargs): - param_defaults = { - 'file_id': None, - 'width': None, - 'height': None, - 'duration': None, - 'thumb': None, - 'mime_type': None, - 'file_size': None, - 'caption': None - } - - for (param, default) in param_defaults.iteritems(): - setattr(self, param, kwargs.get(param, default)) + def __init__(self, + file_id, + width, + height, + duration, + thumb, + mime_type=None, + file_size=None, + caption=None): + self.file_id = file_id + self.width = width + self.height = height + self.duration = duration + self.thumb = thumb + self.mime_type = mime_type + self.file_size = file_size + self.caption = caption @staticmethod def de_json(data):