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

Fixed unittests to match changes to regex patterns.

Browse source
This commit is contained in:
Griatch 2015-09-26 22:24:45 +02:00
parent 7625306b44
commit 350ef90a82
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/contrib/rpsystem.py
View file

@ -73,7 +73,6 @@ Tall man (assuming his name is Tom) sees:
import re
from re import escape as re_escape
import itertools
from copy import copy
from evennia import DefaultObject, DefaultCharacter
from evennia import Command, CmdSet
from evennia import ansi
@ -212,7 +211,7 @@ def ordered_permutation_regex(sentence):
elif comb:
break
if comb:
solution.append(_PREFIX + r"[0-9]*%s*%s(?=\s|$)+" % (_NUM_SEP, re_escape(" ".join(comb)).rstrip("\\")))
solution.append(_PREFIX + r"[0-9]*%s*%s(?=\W|$)+" % (_NUM_SEP, re_escape(" ".join(comb)).rstrip("\\")))
# combine into a match regex, first matching the longest down to the shortest components
regex = r"|".join(sorted(set(solution), key=lambda o:len(o), reverse=True))