notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll back the 3.2-compatibility hack with OrderedDict.keys

Browse Source
This commit is contained in:
Vgr E.Barry 2016-08-03 14:10:27 -04:00
parent 5b22bdd18a
commit b76b214374
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wolfgame.py
View File

@ -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":