From 5d4fccd43874e5c1a6f1f10099da0c4e27556e97 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 26 Nov 2020 20:08:24 -0800
Subject: [PATCH] Fix mypy regressions.

---
 game/theater/start_generator.py | 4 ++--
 gen/sam/sam_group_generator.py  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/game/theater/start_generator.py b/game/theater/start_generator.py
index 09e2c0c5..26fa6c4c 100644
--- a/game/theater/start_generator.py
+++ b/game/theater/start_generator.py
@@ -4,7 +4,7 @@ import logging
 import math
 import pickle
 import random
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, Iterable, Optional
 
 from dcs.mapping import Point
 from dcs.task import CAP, CAS, PinpointStrike
@@ -632,7 +632,7 @@ class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
         self.generate_aa_at(position)
 
     def generate_aa_at(self, position: Point,
-                       filter_names: Optional[List[str]] = None) -> None:
+                       filter_names: Optional[Iterable[str]] = None) -> None:
         group_id = self.game.next_group_id()
 
         g = SamGroundObject(namegen.random_objective_name(), group_id,
diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py
index 12614692..aebcfbf5 100644
--- a/gen/sam/sam_group_generator.py
+++ b/gen/sam/sam_group_generator.py
@@ -1,10 +1,10 @@
 import random
-from typing import List, Optional, Type
+from typing import Iterable, List, Optional, Type
 
 from dcs.unitgroup import VehicleGroup
 from dcs.vehicles import AirDefence
 
-from game import Game, db
+from game import Game
 from game.factions.faction import Faction
 from game.theater import TheaterGroundObject
 from game.theater.theatergroundobject import SamGroundObject
@@ -151,7 +151,8 @@ EWR_MAP = {
 
 def get_faction_possible_sams_generator(
         faction: Faction,
-        filter_names: Optional[List[str]] = None) -> List[Type[GroupGenerator]]:
+        filter_names: Optional[Iterable[str]] = None
+) -> List[Type[GroupGenerator]]:
     """
     Return the list of possible SAM generator for the given faction
     :param faction: Faction name to search units for
@@ -171,7 +172,7 @@ def get_faction_possible_ewrs_generator(faction: Faction) -> List[Type[GroupGene
 
 def generate_anti_air_group(
         game: Game, ground_object: TheaterGroundObject, faction: Faction,
-        filter_names: Optional[List[str]] = None) -> Optional[VehicleGroup]:
+        filter_names: Optional[Iterable[str]] = None) -> Optional[VehicleGroup]:
     """
     This generate a SAM group
     :param game: The Game.