From 33f7f0018eb8a34b8208deb8e28b1b638a589995 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sat, 5 Aug 2017 04:15:16 +0300 Subject: [PATCH] Fix parsing date in Deserializable objects. --- aiogram/types/base.py | 5 +++++ aiogram/types/chat_member.py | 5 ----- aiogram/types/message.py | 4 ---- aiogram/types/webhook_info.py | 4 ---- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/aiogram/types/base.py b/aiogram/types/base.py index d40095a4..cafecab1 100644 --- a/aiogram/types/base.py +++ b/aiogram/types/base.py @@ -59,6 +59,11 @@ class Deserializable: result[name] = attr return result + @classmethod + def _parse_date(cls, unix_time): + if unix_time is not None: + return datetime.datetime.fromtimestamp(unix_time) + @property def bot(self) -> 'Bot': """ diff --git a/aiogram/types/chat_member.py b/aiogram/types/chat_member.py index e471a91d..3ef7311a 100644 --- a/aiogram/types/chat_member.py +++ b/aiogram/types/chat_member.py @@ -35,11 +35,6 @@ class ChatMember(Deserializable): self.can_send_other_messages: bool = can_send_other_messages self.can_add_web_page_previews: bool = can_add_web_page_previews - @classmethod - def _parse_date(cls, unix_time): - if unix_time is not None: - return datetime.datetime.fromtimestamp(unix_time) - @classmethod def de_json(cls, raw_data): user = User.deserialize(raw_data.get('user')) diff --git a/aiogram/types/message.py b/aiogram/types/message.py index 3a4d6a97..7cf95a91 100644 --- a/aiogram/types/message.py +++ b/aiogram/types/message.py @@ -74,10 +74,6 @@ class Message(Deserializable): self.content_type = content_type - @classmethod - def _parse_date(cls, unix_time): - return datetime.datetime.fromtimestamp(unix_time) - @classmethod def de_json(cls, raw_data): message_id = raw_data.get('message_id') diff --git a/aiogram/types/webhook_info.py b/aiogram/types/webhook_info.py index c8b2805b..de0f6f4c 100644 --- a/aiogram/types/webhook_info.py +++ b/aiogram/types/webhook_info.py @@ -19,10 +19,6 @@ class WebhookInfo(Deserializable): self.max_connections: int = max_connections self.allowed_updates: [str] = allowed_updates - @classmethod - def _parse_date(cls, unix_time): - return datetime.datetime.fromtimestamp(unix_time) - @classmethod def de_json(cls, raw_data): url = raw_data.get('url')