Pre-emptive Python 3.10 compat.

Iterator is no longer exposed directly in collections, but is in
collections.abc.
This commit is contained in:
Dan Albert
2021-11-20 18:49:14 -08:00
parent 66c8b96c9a
commit 12f420f50e
30 changed files with 54 additions and 54 deletions

View File

@@ -2,16 +2,16 @@ from __future__ import annotations
import math
import operator
from collections import Iterator, Iterable
from typing import TypeVar, TYPE_CHECKING
from collections.abc import Iterable, Iterator
from typing import TYPE_CHECKING, TypeVar
from game.theater import (
Airfield,
ControlPoint,
OffMapSpawn,
MissionTarget,
Fob,
FrontLine,
Airfield,
MissionTarget,
OffMapSpawn,
)
from game.theater.theatergroundobject import (
BuildingGroundObject,
@@ -19,7 +19,7 @@ from game.theater.theatergroundobject import (
NavalGroundObject,
)
from game.utils import meters, nautical_miles
from gen.flights.closestairfields import ObjectiveDistanceCache, ClosestAirfields
from gen.flights.closestairfields import ClosestAirfields, ObjectiveDistanceCache
if TYPE_CHECKING:
from game import Game