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

Port a few miscellaneous items.

Browse source
This commit is contained in:
Ryan Stein 2017-10-29 22:21:38 -04:00
parent b5cf27fc18
commit ee58e59e7e
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/typeclasses/attributes.py
View file

@ -753,7 +753,9 @@ def initialize_nick_templates(in_template, out_template):
# create the regex for in_template
regex_string = fnmatch.translate(in_template)
# we must account for a possible line break coming over the wire
regex_string = regex_string[:-7] + r"(?:[\n\r]*?)\Z(?ms)"
# NOTE-PYTHON3: fnmatch.translate format changed since Python2
regex_string = regex_string[:-2] + r"(?:[\n\r]*?)\Z"
# validate the templates
regex_args = [match.group(2) for match in _RE_NICK_ARG.finditer(regex_string)]