From b76b2143745febac97f821ef97a0fcf3d0254a58 Mon Sep 17 00:00:00 2001 From: "Vgr E.Barry" Date: Wed, 3 Aug 2016 14:10:27 -0400 Subject: [PATCH] Roll back the 3.2-compatibility hack with OrderedDict.keys --- src/wolfgame.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index 2feb71a..59d2d9c 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -2826,10 +2826,7 @@ def chk_win_conditions(lpl, lwolves, lcubs, lrealwolves, lmonsters, ldemoniacs, for plr in list_players(var.WOLFTEAM_ROLES): players.append("{0} ({1})".format(plr, get_role(plr))) elif winner == "villagers": - # There is a regression issue in the 3.2 collections module - and possibly 3.3, cannot tell - where OrderedDict.keys is not set-like - # this was fixed in later releases, and since development and main instance are on 3.4 or 3.5, this was not noticed - # collections.OrderedDict being a dict subclass, dict methods all work. Thus, we can pass the instance to dict.keys and be done with it (since it's set-like) - vroles = (role for role in var.ROLES.keys() if var.ROLES[role] and role not in (var.WOLFTEAM_ROLES | var.TRUE_NEUTRAL_ROLES | dict.keys(var.TEMPLATE_RESTRICTIONS))) + vroles = (role for role in var.ROLES.keys() if var.ROLES[role] and role not in (var.WOLFTEAM_ROLES | var.TRUE_NEUTRAL_ROLES | var.TEMPLATE_RESTRICTIONS.keys())) for plr in list_players(vroles): players.append("{0} ({1})".format(plr, get_role(plr))) elif winner == "pipers":