From 4ff605d6c55fcf3e9b4777ffbcb0c24ef17ba4ca Mon Sep 17 00:00:00 2001 From: Arti Date: Mon, 28 Feb 2022 21:19:50 +0100 Subject: [PATCH] Rename instances of `collections.Iterable` into `collections.abc.Iterable` (#2956) --- horizons/ai/aiplayer/combat/unitmanager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/horizons/ai/aiplayer/combat/unitmanager.py b/horizons/ai/aiplayer/combat/unitmanager.py index 8449d5563c5..57db0d47061 100644 --- a/horizons/ai/aiplayer/combat/unitmanager.py +++ b/horizons/ai/aiplayer/combat/unitmanager.py @@ -151,7 +151,7 @@ def _ship_state_rule(self, state_dict, ship_states): """ Rule stating that ship has to be in any of given states. """ - if not isinstance(ship_states, collections.Iterable): + if not isinstance(ship_states, collections.abc.Iterable): ship_states = (ship_states,) return lambda ship: (state_dict[ship] in ship_states) @@ -178,7 +178,7 @@ def filter_ships(self, ships, rules): @param rules: conditions each ship has to meet (AND) @type rules: iterable of lambda(ship) or single lambda(ship) """ - if not isinstance(rules, collections.Iterable): + if not isinstance(rules, collections.abc.Iterable): rules = (rules,) return [ship for ship in ships if all((rule(ship) for rule in rules))] a href='/guix/commit/gnu/installer/newt/locale.scm?id=a8d5d087086da0e47700781ff858d3d0d2090271'>commitdiff
path: root/gnu/installer/newt/locale.scm
AgeCommit message (Expand)Author
2022-02-02installer: Use named prompt to abort or break installer steps....* gnu/installer/steps.scm (run-installer-steps): Set up 'installer-step prompt. * gnu/installer/newt/ethernet.scm (run-ethernet-page) * gnu/installer/newt/final.scm (run-config-display-page, run-install-failed-page) * gnu/installer/newt/keymap.scm (run-layout-page, run-variant-page) * gnu/installer/newt/locale.scm (run-language-page, run-territory-page, run-codeset-page, run-modifier-page, run-locale-page) * gnu/installer/newt/network.scm (run-technology-page, wait-service-online) * gnu/installer/newt/page.scm (run-listbox-selection-page, run-checkbox-tree-page) * gnu/installer/newt/partition.scm (button-exit-action) * gnu/installer/newt/services.scm (run-desktop-environments-cbt-page, run-networking-cbt-page, run-other-services-cbt-page, run-network-management-page) * gnu/installer/newt/timezone.scm (run-timezone-page) * gnu/installer/newt/user.scm (run-user-page) * gnu/installer/newt/welcome.scm (run-menu-page) * gnu/installer/newt/wifi.scm (run-wifi-page): Use the 'installer-step prompt to abort. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Josselin Poiret