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

Allow multi-character keys for EvForm cells and tables. This was due to a too restrictive regex. Resolves #1014.

Browse source
This commit is contained in:
Griatch 2016-08-20 11:41:53 +02:00
parent 1da9217a18
commit 49087b50d1
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/evform.py
View file

@ -232,8 +232,8 @@ class EvForm(object):
table_coords = {}
# Locate the identifier tags and the horizontal end coords for all forms
re_cellchar = re.compile(r"%s+([^%s%s])%s+" % (cellchar, INVALID_FORMCHARS, cellchar, cellchar))
re_tablechar = re.compile(r"%s+([^%s%s|])%s+" % (tablechar, INVALID_FORMCHARS, tablechar, tablechar))
re_cellchar = re.compile(r"%s+([^%s%s]+)%s+" % (cellchar, INVALID_FORMCHARS, cellchar, cellchar))
re_tablechar = re.compile(r"%s+([^%s%s|+])%s+" % (tablechar, INVALID_FORMCHARS, tablechar, tablechar))
for iy, line in enumerate(_to_ansi(form, regexable=True)):
# find cells
ix0 = 0
@ -429,7 +429,7 @@ def _test():
form = EvForm("evennia.utils.evform_test")
# add data to each tagged form cell
form.map(cells={1: "|gTom the Bouncer",
form.map(cells={"AA": "|gTom the Bouncer",
2: "|yGriatch",
3: "A sturdy fellow",
4: 12,