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

Restore OrderedDict hack, still needed in 3.3

Browse Source
This commit is contained in:
nyuszika7h 2016-08-05 22:06:15 +02:00
parent 274a132f65
commit fe9877f471
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wolfgame.py
View File

@ -2828,7 +2828,10 @@ def chk_win_conditions(lpl, lwolves, lcubs, lrealwolves, lmonsters, ldemoniacs,
for plr in list_players(var.WOLFTEAM_ROLES): for plr in list_players(var.WOLFTEAM_ROLES):
players.append("{0} ({1})".format(plr, get_role(plr))) players.append("{0} ({1})".format(plr, get_role(plr)))
elif winner == "villagers": elif winner == "villagers":
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())) # There is a regression issue in the 3.3 collections module 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)))
for plr in list_players(vroles): for plr in list_players(vroles):
players.append("{0} ({1})".format(plr, get_role(plr))) players.append("{0} ({1})".format(plr, get_role(plr)))
elif winner == "pipers": elif winner == "pipers":