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

Remove setting.SEARCH_MULTIMATCH_SEPARATOR, replacing it with SEARCH_MULTIMATCH_REGEX and SEARCH_MULTIMATCH_TEMPLATE. This allows simple yet powerful control over the error output without needing to overload the parser.

Browse source
This commit is contained in:
Griatch 2016-09-11 10:39:47 +02:00
parent ad8d105795
commit e6f857a536
5 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/objects/manager.py
View file

@ -17,8 +17,7 @@ _GA = object.__getattribute__
# delayed import
_ATTR = None
_MULTIMATCH_REGEX = re.compile(r"([0-9]+)%s(.*)" %
settings.SEARCH_MULTIMATCH_SEPARATOR, re.I + re.U)
_MULTIMATCH_REGEX = re.compile(settings.SEARCH_MULTIMATCH_REGEX, re.I + re.U)
# Try to use a custom way to parse id-tagged multimatches.
@ -389,7 +388,7 @@ class ObjectDBManager(TypedObjectManager):
match_number = None
if match:
# strips the number
match_number, searchdata = match.groups()
match_number, searchdata = match.group("number"), match.group("name")
match_number = int(match_number) - 1
match_number = match_number if match_number >= 0 else None
if match_number is not None or not exact: