diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index d21c37b6..9edcdb3e 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -1,7 +1,7 @@ from __future__ import annotations import logging -from collections import Iterable +from collections.abc import Iterable from dataclasses import dataclass, field from typing import Optional, Sequence, TYPE_CHECKING diff --git a/game/squadrons/squadrondef.py b/game/squadrons/squadrondef.py index 3893e101..3551521f 100644 --- a/game/squadrons/squadrondef.py +++ b/game/squadrons/squadrondef.py @@ -1,7 +1,7 @@ from __future__ import annotations import logging -from collections import Iterable +from collections.abc import Iterable from dataclasses import dataclass, field from pathlib import Path from typing import Optional, TYPE_CHECKING diff --git a/game/theater/missiontarget.py b/game/theater/missiontarget.py index 507b8167..5942bb0e 100644 --- a/game/theater/missiontarget.py +++ b/game/theater/missiontarget.py @@ -1,7 +1,7 @@ from __future__ import annotations -from collections import Sequence -from typing import Iterator, TYPE_CHECKING, List, Union +from collections.abc import Sequence +from typing import Iterator, TYPE_CHECKING, Union from dcs.mapping import Point from dcs.unit import Unit diff --git a/game/theater/theatergroundobject.py b/game/theater/theatergroundobject.py index 0b8ffa7b..bdafe2aa 100644 --- a/game/theater/theatergroundobject.py +++ b/game/theater/theatergroundobject.py @@ -3,8 +3,8 @@ from __future__ import annotations import itertools import logging from abc import ABC -from collections import Sequence -from typing import Iterator, List, TYPE_CHECKING, Union, Generic, TypeVar +from collections.abc import Sequence +from typing import Generic, Iterator, List, TYPE_CHECKING, TypeVar, Union from dcs.mapping import Point from dcs.triggers import TriggerZone @@ -12,11 +12,7 @@ from dcs.unit import Unit from dcs.unitgroup import ShipGroup, VehicleGroup from .. import db -from ..data.radar_db import ( - TRACK_RADARS, - TELARS, - LAUNCHER_TRACKER_PAIRS, -) +from ..data.radar_db import LAUNCHER_TRACKER_PAIRS, TELARS, TRACK_RADARS from ..utils import Distance, Heading, meters if TYPE_CHECKING: diff --git a/gen/flights/ai_flight_planner_db.py b/gen/flights/ai_flight_planner_db.py index 889fcb36..c47cc658 100644 --- a/gen/flights/ai_flight_planner_db.py +++ b/gen/flights/ai_flight_planner_db.py @@ -1,5 +1,5 @@ import logging -from collections import Sequence +from collections.abc import Sequence from typing import Type from dcs.helicopters import ( diff --git a/gen/sam/group_generator.py b/gen/sam/group_generator.py index bbe6bdb9..3eb4ce34 100644 --- a/gen/sam/group_generator.py +++ b/gen/sam/group_generator.py @@ -3,21 +3,20 @@ from __future__ import annotations import logging import math import operator -import random -from collections import Iterable -from typing import TYPE_CHECKING, Type, TypeVar, Generic, Any +from collections.abc import Iterable +from typing import Any, Generic, TYPE_CHECKING, Type, TypeVar from dcs import unitgroup from dcs.mapping import Point from dcs.point import PointAction -from dcs.unit import Ship, Vehicle, Unit +from dcs.unit import Ship, Unit, Vehicle from dcs.unitgroup import ShipGroup, VehicleGroup -from dcs.unittype import VehicleType, UnitType, ShipType +from dcs.unittype import ShipType, UnitType, VehicleType from game.dcs.groundunittype import GroundUnitType from game.factions.faction import Faction from game.theater import MissionTarget -from game.theater.theatergroundobject import TheaterGroundObject, NavalGroundObject +from game.theater.theatergroundobject import NavalGroundObject, TheaterGroundObject from game.utils import Heading if TYPE_CHECKING: diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py index 849061d3..acdf5571 100644 --- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py +++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py @@ -1,6 +1,6 @@ -from collections import Callable +from collections.abc import Callable -from PySide6.QtWidgets import QGroupBox, QLabel, QVBoxLayout, QPushButton +from PySide6.QtWidgets import QGroupBox, QLabel, QPushButton, QVBoxLayout from game import Game from game.theater import ControlPoint