fix imports with isort

core/configs/consts.py

@@ -2,10 +2,11 @@
 This file is created for config which is not depends on a particular project
 and you won't need to specify them, but vars from here are used in other configs
 """
-import pytz
 from datetime import date, timedelta
 from pathlib import Path
 
+import pytz
+
 BASE_DIR: Path = Path().cwd()
 LOGS_FOLDER: Path = BASE_DIR / "logs"
 

core/database/db_worker.py

@@ -2,9 +2,10 @@
 
 from motor import motor_asyncio
 
-from .models.user_model import instance, User
 from core.configs import database
 
+from .models.user_model import User, instance
+
 
 async def update_user(chat_id, **kwargs):
     """

core/database/models/user_model.py

@@ -1,5 +1,5 @@
 from umongo import Document, MotorAsyncIOInstance
-from umongo.fields import IntField, StringField, ListField
+from umongo.fields import IntField, ListField, StringField
 
 instance = MotorAsyncIOInstance()
 

core/handlers.py

@@ -15,20 +15,18 @@
 
 import core.reply_markups as markups
 from core import strings
-from core.configs import telegram, database, consts
+from core.configs import consts, database, telegram
 from core.database import db_worker as db
 from core.database.models import user_model
 from core.reply_markups.callbacks.language_choice import language_callback
-from core.reply_markups.inline import available_languages as available_languages_markup
+from core.reply_markups.inline import \
+    available_languages as available_languages_markup
 from core.strings.scripts import _
 from core.utils import decorators
-from core.utils.middlewares import update_middleware, logger_middleware
-from core.utils.states import (
-    MailingEveryoneDialog,
-    SetCleaningReminderStates,
-    OffCleaningReminderStates,
-    ChooseLanguageDialog,
-)
+from core.utils.middlewares import logger_middleware, update_middleware
+from core.utils.states import (ChooseLanguageDialog, MailingEveryoneDialog,
+                               OffCleaningReminderStates,
+                               SetCleaningReminderStates)
 
 logging.basicConfig(
     format="[%(asctime)s] %(levelname)s : %(name)s : %(message)s",

core/reply_markups/inline.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 
-from core.strings import LANGUAGE_MAPPING
 from core.reply_markups.callbacks import *
+from core.strings import LANGUAGE_MAPPING
 
 available_languages = InlineKeyboardMarkup()
 available_languages.add(

core/strings/__init__.py

@@ -1,2 +1,2 @@
-from .scripts import on_startup, LANGUAGE_MAPPING
 from .keys import *
+from .scripts import LANGUAGE_MAPPING, on_startup

core/strings/scripts.py

@@ -2,7 +2,8 @@
 Scripts which are somehow connected to locales
 """
 from aiogram import Dispatcher
-from core.configs.locales import LOCALES_DIR, I18N_DOMAIN
+
+from core.configs.locales import I18N_DOMAIN, LOCALES_DIR
 from core.utils.middlewares.aclmiddleware import ACLMiddleware
 
 i18n = ACLMiddleware(I18N_DOMAIN, LOCALES_DIR)

core/utils/middlewares/aclmiddleware.py

@@ -1,10 +1,11 @@
 import logging
+from typing import Any, Tuple
 
+from aiogram import Dispatcher, types
 from aiogram.contrib.middlewares.i18n import I18nMiddleware
-from aiogram import types, Dispatcher
-from core.database.db_worker import get_user
+
 from core.configs.locales import DEFAULT_USER_LOCALE, LANGUAGES
-from typing import Tuple, Any
+from core.database.db_worker import get_user
 
 
 class ACLMiddleware(I18nMiddleware):

core/utils/middlewares/logger_middleware.py

@@ -1,9 +1,8 @@
-import time
 import logging
+import time
 
-
+from aiogram import Dispatcher, types
 from aiogram.dispatcher.middlewares import BaseMiddleware
-from aiogram import types, Dispatcher
 
 HANDLED_STR = ["Unhandled", "Handled"]
 

core/utils/middlewares/update_middleware.py

@@ -1,4 +1,4 @@
-from aiogram import types, Dispatcher
+from aiogram import Dispatcher, types
 from aiogram.dispatcher.middlewares import BaseMiddleware
 
 from core.database.db_worker import update_user

core/utils/states/__init__.py

@@ -1,3 +1,3 @@
+from .choose_language import *
 from .cleaning_reminder import *
 from .mailing_everyone import *
-from .choose_language import *

core/utils/states/cleaning_reminder.py

@@ -1,4 +1,4 @@
-from aiogram.dispatcher.filters.state import StatesGroup, State
+from aiogram.dispatcher.filters.state import State, StatesGroup
 
 
 class SetCleaningReminderStates(StatesGroup):

requirements.txt

@@ -9,6 +9,7 @@ dnspython==1.16.0
 python-rapidjson==0.7.2
 python-dotenv==0.10.3
 black==19.10b0
+isort==4.3.21
 
 aioredis==1.2.0
 redis==3.2.1