Reformat code. Use rel imports.

aiogram/api.py

@@ -1,5 +1,5 @@
-from aiogram import API_URL, log
+from . import API_URL, log
-from aiogram.exceptions import ValidationError, TelegramAPIError
+from .exceptions import ValidationError, TelegramAPIError
 
 
 def check_token(token):

aiogram/bot.py

@@ -2,11 +2,10 @@ import asyncio
 
 import aiohttp
 
-from aiogram.types.message import Message
-from aiogram.utils.payload import generate_payload
 from . import api
 from .api import ApiMethods
 from .types.chat import Chat
+from .types.message import Message
 from .types.update import Update
 from .types.user import User
 from .utils.payload import generate_payload

aiogram/types/animation.py

@@ -1,5 +1,5 @@
-from aiogram.types.photo_size import PhotoSize
+from . import Deserializable
-from . import Deserializable, deserialize
+from .photo_size import PhotoSize
 
 
 class Animation(Deserializable):

aiogram/types/callback_query.py

@@ -1,6 +1,6 @@
-from aiogram.types.message import Message
+from . import Deserializable
-from aiogram.types.user import User
+from .message import Message
-from . import Deserializable, deserialize
+from .user import User
 
 
 class CallbackQuery(Deserializable):

aiogram/types/chat_member.py

@@ -1,5 +1,5 @@
-from aiogram.types.user import User
+from . import Deserializable
-from . import Deserializable, deserialize
+from .user import User
 
 
 class ChatMember(Deserializable):

aiogram/types/chosen_inline_result.py

@@ -1,6 +1,6 @@
-from aiogram.types.location import Location
-from aiogram.types.user import User
 from . import Deserializable
+from .location import Location
+from .user import User
 
 
 class ChosenInlineResult(Deserializable):

aiogram/types/document.py

@@ -1,5 +1,5 @@
-from aiogram.types.photo_size import PhotoSize
+from . import Deserializable
-from . import Deserializable, deserialize
+from .photo_size import PhotoSize
 
 
 class Document(Deserializable):

aiogram/types/game.py

@@ -1,7 +1,7 @@
-from aiogram.types.animation import Animation
-from aiogram.types.message_entity import MessageEntity
-from aiogram.types.photo_size import PhotoSize
 from . import Deserializable
+from .animation import Animation
+from .message_entity import MessageEntity
+from .photo_size import PhotoSize
 
 
 class Game(Deserializable):

aiogram/types/inline_query.py

@@ -1,6 +1,6 @@
-from aiogram.types.location import Location
-from aiogram.types.user import User
 from . import Deserializable
+from .location import Location
+from .user import User
 
 
 class InlineQuery(Deserializable):

aiogram/types/message.py

@@ -21,12 +21,12 @@ from .voice import Voice
 
 
 class Message(Deserializable):
-    def __init__(self, message_id, from_user, date, chat, forward_from, forward_from_chat,
+    def __init__(self, message_id, from_user, date, chat, forward_from, forward_from_chat, forward_from_message_id,
-                 forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio, document,
+                 forward_date, reply_to_message, edit_date, text, entities, audio, document, game, photo, sticker,
-                 game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact, location, venue,
+                 video, voice, video_note, new_chat_members, caption, contact, location, venue, left_chat_member,
-                 left_chat_member, new_chat_title, new_chat_photo, delete_chat_photo,
+                 new_chat_title, new_chat_photo, delete_chat_photo, group_chat_created, supergroup_chat_created,
-                 group_chat_created, supergroup_chat_created, channel_chat_created, migrate_to_chat_id,
+                 channel_chat_created, migrate_to_chat_id, migrate_from_chat_id, pinned_message, invoice,
-                 migrate_from_chat_id, pinned_message, invoice, successful_payment, content_type):
+                 successful_payment, content_type):
         self.message_id: int = message_id
         self.from_user: User = from_user
         self.date: datetime.datetime = date
@@ -140,13 +140,12 @@ class Message(Deserializable):
         else:
             content_type = ContentType.UNKNOWN
 
-        return Message(message_id, from_user, date, chat, forward_from, forward_from_chat,
+        return Message(message_id, from_user, date, chat, forward_from, forward_from_chat, forward_from_message_id,
-                       forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio,
+                       forward_date, reply_to_message, edit_date, text, entities, audio, document, game, photo, sticker,
-                       document, game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact,
+                       video, voice, video_note, new_chat_members, caption, contact, location, venue, left_chat_member,
-                       location, venue, left_chat_member, new_chat_title, new_chat_photo,
+                       new_chat_title, new_chat_photo, delete_chat_photo, group_chat_created, supergroup_chat_created,
-                       delete_chat_photo, group_chat_created, supergroup_chat_created, channel_chat_created,
+                       channel_chat_created, migrate_to_chat_id, migrate_from_chat_id, pinned_message, invoice,
-                       migrate_to_chat_id, migrate_from_chat_id, pinned_message, invoice, successful_payment,
+                       successful_payment, content_type)
-                       content_type)
 
     def is_command(self):
         return self.text and self.text.startswith('/')

aiogram/types/message_entity.py

@@ -1,4 +1,4 @@
-from . import Deserializable, deserialize
+from . import Deserializable
 from .user import User
 
 

aiogram/types/order_info.py

@@ -1,5 +1,5 @@
-from aiogram.types.shipping_address import ShippingAddress
 from . import Deserializable
+from .shipping_address import ShippingAddress
 
 
 class OrderInfo(Deserializable):

aiogram/types/pre_checkout_query.py

@@ -1,6 +1,6 @@
-from aiogram.types.order_info import OrderInfo
-from aiogram.types.user import User
 from . import Deserializable
+from .order_info import OrderInfo
+from .user import User
 
 
 class PreCheckoutQuery(Deserializable):

aiogram/types/shipping_query.py

@@ -1,6 +1,6 @@
-from aiogram.types.shipping_address import ShippingAddress
-from aiogram.types.user import User
 from . import Deserializable
+from .shipping_address import ShippingAddress
+from .user import User
 
 
 class ShippingQuery(Deserializable):

aiogram/types/sticker.py

@@ -1,5 +1,5 @@
-from aiogram.types.photo_size import PhotoSize
 from . import Deserializable
+from .photo_size import PhotoSize
 
 
 class Sticker(Deserializable):

aiogram/types/successful_payment.py

@@ -1,5 +1,5 @@
-from aiogram.types.order_info import OrderInfo
 from . import Deserializable
+from .order_info import OrderInfo
 
 
 class SuccessfulPayment(Deserializable):

aiogram/types/update.py

@@ -8,7 +8,7 @@ from .message import Message
 
 
 class Update(Deserializable):
-    def __init__(self, update_id, message, edited_message, channel_post, edited_channel_post, inline_query,
+    def __init__(self, update_id, message, edited_maiogramessage, channel_post, edited_channel_post, inline_query,
                  chosen_inline_result, callback_query, shipping_query, pre_checkout_query):
         self.update_id: int = update_id
         self.message: Message = message

aiogram/types/user_profile_photos.py

@@ -1,5 +1,5 @@
-from aiogram.types.photo_size import PhotoSize
 from . import Deserializable
+from .photo_size import PhotoSize
 
 
 class UserProfilePhotos(Deserializable):

aiogram/types/venue.py

@@ -1,5 +1,5 @@
-from aiogram.types.location import Location
 from . import Deserializable
+from .location import Location
 
 
 class Venue(Deserializable):

aiogram/types/video.py

@@ -1,5 +1,5 @@
-from aiogram.types.photo_size import PhotoSize
 from . import Deserializable
+from .photo_size import PhotoSize
 
 
 class Video(Deserializable):

aiogram/types/video_note.py

@@ -1,5 +1,5 @@
-from .photo_size import PhotoSize
 from . import Deserializable
+from .photo_size import PhotoSize
 
 
 class VideoNote(Deserializable):