Fix and reorder imports

aleksis/apps/untis/forms.py

-from constance import config
 from django import forms
 from django.utils.translation import ugettext_lazy as _
+
+from constance import config
 from material import Fieldset
 
 from aleksis.core.forms import EditGroupForm

aleksis/apps/untis/management/commands/untis_import_xml.py

 from django.core.management.base import BaseCommand
 from django.utils.translation import ugettext as _
 
-from aleksis.apps.untis.util.xml.xml import untis_import_xml
+from ...util.xml.xml import untis_import_xml
 
 
 class Command(BaseCommand):

aleksis/apps/untis/model_extensions.py

-from constance import config
 from django.utils.translation import gettext as _
-from jsonstore import IntegerField, CharField
+
+from constance import config
+from jsonstore import CharField, IntegerField
 
 from aleksis.apps.chronos import models as chronos_models
 from aleksis.core import models as core_models

aleksis/apps/untis/settings.py

-from aleksis.core.settings import _settings
 from django.utils.translation import gettext_lazy as _
 
+from aleksis.core.settings import _settings
+
 DATABASES = {
     "untis": {
         "ENGINE": "django.db.backends.mysql",

aleksis/apps/untis/util/mysql/importers/absences.py

-from enum import Enum
 import logging
+from enum import Enum
 
 from tqdm import tqdm
 
@@ -7,13 +7,13 @@ from aleksis.apps.chronos import models as chronos_models
 
 from .... import models as mysql_models
 from ..util import (
-    run_default_filter,
-    get_term,
-    untis_date_to_date,
-    move_weekday_to_range,
+    TQDM_DEFAULTS,
     get_first_period,
     get_last_period,
-    TQDM_DEFAULTS,
+    get_term,
+    move_weekday_to_range,
+    run_default_filter,
+    untis_date_to_date,
 )
 
 logger = logging.getLogger(__name__)

aleksis/apps/untis/util/mysql/importers/common_data.py

-from enum import Enum
 import logging
 from datetime import time
-from typing import List, Dict
+from enum import Enum
+from typing import Dict, List
 
 from constance import config
 from tqdm import tqdm
@@ -11,11 +11,11 @@ from aleksis.core import models as core_models
 
 from .... import models as mysql_models
 from ..util import (
+    TQDM_DEFAULTS,
+    connect_untis_fields,
     run_default_filter,
     untis_colour_to_hex,
     untis_split_first,
-    connect_untis_fields,
-    TQDM_DEFAULTS,
 )
 
 logger = logging.getLogger(__name__)

aleksis/apps/untis/util/mysql/importers/events.py

@@ -6,14 +6,14 @@ from aleksis.apps.chronos import models as chronos_models
 
 from .... import models as mysql_models
 from ..util import (
-    run_default_filter,
-    get_term,
-    untis_date_to_date,
-    move_weekday_to_range,
+    TQDM_DEFAULTS,
+    connect_untis_fields,
     get_first_period,
     get_last_period,
-    connect_untis_fields,
-    TQDM_DEFAULTS,
+    get_term,
+    move_weekday_to_range,
+    run_default_filter,
+    untis_date_to_date,
 )
 
 logger = logging.getLogger(__name__)

aleksis/apps/untis/util/mysql/importers/holidays.py

@@ -6,7 +6,7 @@ from tqdm import tqdm
 from aleksis.apps.chronos import models as chronos_models
 
 from .... import models as mysql_models
-from ..util import run_default_filter, untis_date_to_date, TQDM_DEFAULTS
+from ..util import TQDM_DEFAULTS, run_default_filter, untis_date_to_date
 
 logger = logging.getLogger(__name__)
 

aleksis/apps/untis/util/mysql/importers/lessons.py

 import logging
 from datetime import timedelta
 
-from constance import config
 from django.utils.translation import gettext as _
+
+from constance import config
 from tqdm import tqdm
 
 from aleksis.apps.chronos import models as chronos_models
@@ -10,13 +11,13 @@ from aleksis.core import models as core_models
 
 from .... import models as mysql_models
 from ..util import (
-    run_default_filter,
-    untis_split_third,
-    untis_date_to_date,
-    get_term,
+    TQDM_DEFAULTS,
     compare_m2m,
     connect_untis_fields,
-    TQDM_DEFAULTS,
+    get_term,
+    run_default_filter,
+    untis_date_to_date,
+    untis_split_third,
 )
 
 logger = logging.getLogger(__name__)

aleksis/apps/untis/util/mysql/importers/substitutions.py

-from enum import Enum
 import logging
+from enum import Enum
 
-from calendarweek import CalendarWeek
 from django.db.models import Q
+
+from calendarweek import CalendarWeek
 from tqdm import tqdm
 
 from aleksis.apps.chronos import models as chronos_models
+
+from .... import models as mysql_models
 from ..util import (
+    TQDM_DEFAULTS,
+    get_term,
     run_default_filter,
-    untis_split_first,
     untis_date_to_date,
-    get_term,
-    TQDM_DEFAULTS,
+    untis_split_first,
 )
-from .... import models as mysql_models
 
 logger = logging.getLogger(__name__)
 

aleksis/apps/untis/util/mysql/main.py

@@ -2,14 +2,14 @@ from django.db import transaction
 
 from .importers.absences import import_absences
 from .importers.common_data import (
-    import_subjects,
+    import_absence_reasons,
+    import_breaks,
     import_classes,
     import_rooms,
+    import_subjects,
     import_supervision_areas,
     import_teachers,
     import_time_periods,
-    import_breaks,
-    import_absence_reasons,
 )
 from .importers.events import import_events
 from .importers.holidays import import_holidays

aleksis/apps/untis/util/mysql/util.py

 import logging
 from datetime import date
-from typing import Optional, Union, Sequence, Callable, Any
+from typing import Any, Callable, Optional, Sequence, Union
 
-from django.db.models import QuerySet, Model
+from django.db.models import Model, QuerySet
 from django.utils import timezone
 
 from ... import models as mysql_models
@@ -116,13 +116,13 @@ def untis_colour_to_hex(colour: int) -> str:
     return "#" + hex_rgb
 
 
-def compare_m2m(a: Union[List[Model], QuerySet], b: Union[List[Model], QuerySet]) -> bool:
+def compare_m2m(a: Union[Sequence[Model], QuerySet], b: Union[Sequence[Model], QuerySet]) -> bool:
     """ Compare if content of two m2m fields is equal """
 
     return set(a) == set(b)
 
 
-def connect_untis_fields(obj: Model, attr: str, limit: int) -> List[str]:
+def connect_untis_fields(obj: Model, attr: str, limit: int) -> Sequence[str]:
     """ Connects data from multiple DB fields
 
     Untis splits structured data, like lists, as comma-separated string into

aleksis/apps/untis/views.py

@@ -5,7 +5,7 @@ from django.shortcuts import render
 from aleksis.core.decorators import admin_required
 
 from .forms import UntisUploadForm
-from aleksis.apps.untis.util.xml.xml import untis_import_xml
+from .util.xml.xml import untis_import_xml
 
 
 @login_required