From c7b689c1d8afa4fe8c820c7c412dd0047ddd11ba Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 13 Oct 2016 22:10:49 +0200 Subject: [PATCH] Fix unittests and a lingering error in the solution to #1073. --- evennia/contrib/rpsystem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py index fd0a16daf7..ceef937f47 100644 --- a/evennia/contrib/rpsystem.py +++ b/evennia/contrib/rpsystem.py @@ -340,8 +340,8 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False): """ # Load all candidate regex tuples [(regex, obj, sdesc/recog),...] candidate_regexes = \ - [(_RE_SELF_REF, sender, sender.sdesc.get())] if hasattr(sender, "sdesc") else [] + \ - [sender.recog.get_regex_tuple(obj) for obj in candidates] if hasattr(sender, "recog") else [] + \ + ([(_RE_SELF_REF, sender, sender.sdesc.get())] if hasattr(sender, "sdesc") else [])+ \ + ([sender.recog.get_regex_tuple(obj) for obj in candidates] if hasattr(sender, "recog") else []) + \ [obj.sdesc.get_regex_tuple() for obj in candidates if hasattr(obj, "sdesc")] + \ [regex_tuple_from_key_alias(obj) # handle objects without sdescs