Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2022-08-05 20:45:40 +02:00
commit e84933d452
7 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/typeclasses/attributes.py
View file

@ -1552,7 +1552,7 @@ def parse_nick_template(string, template_regex, outtemplate):
matchdict = {
key: value if value is not None else "" for key, value in match.groupdict().items()
}
return True, outtemplate.format(**matchdict)
return True, outtemplate.format_map(matchdict)
return False, string