From 49087b50d1a86484df7d4f5fd9adc5b13386a08b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Aug 2016 11:41:53 +0200
Subject: [PATCH] Allow multi-character keys for EvForm cells and tables. This
 was due to a too restrictive regex. Resolves #1014.

---
 evennia/contrib/rpsystem.py  | 1 -
 evennia/utils/evform.py      | 6 +++---
 evennia/utils/evform_test.py | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index 6a6874536a..fd7a5933a1 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -1145,7 +1145,6 @@ class ContribRPObject(DefaultObject):
             if searchdata.lower() in ("me", "self",):
                 return [self] if quiet else self
 
-
         if use_nicks:
             # do nick-replacement on search
             searchdata = self.nicks.nickreplace(searchdata, categories=("object", "player"), include_player=True)
diff --git a/evennia/utils/evform.py b/evennia/utils/evform.py
index c2c162f786..c24157e5dc 100644
--- a/evennia/utils/evform.py
+++ b/evennia/utils/evform.py
@@ -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,
diff --git a/evennia/utils/evform_test.py b/evennia/utils/evform_test.py
index 7cdec79590..8d7dd8a2ca 100644
--- a/evennia/utils/evform_test.py
+++ b/evennia/utils/evform_test.py
@@ -9,7 +9,7 @@ TABLECHAR = "c"
 FORM = """
 .------------------------------------------------.
 |                                                |
-|  Name: xxxxx1xxxxx    Player: xxxxxxx2xxxxxxx  |
+|  Name: xxxxxAAxxxx    Player: xxxxxxx2xxxxxxx  |
 |        xxxxxxxxxxx                             |
 |                                                |
  >----------------------------------------------<