Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix funcparser issues

Browse source
This commit is contained in:
Griatch 2022-10-13 18:45:39 +02:00
parent 788de8af47
commit 2d74c89eb8
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/utils/funcparser.py
View file

@ -354,7 +354,7 @@ class FuncParser:
if curr_func:
# we are starting a nested funcdef
return_str = True
# return_str = True
if len(callstack) > _MAX_NESTING:
# stack full - ignore this function
if raise_errors:

31
evennia/utils/tests/test_funcparser.py
View file

@ -5,8 +5,8 @@ Test the funcparser module.
"""
import time
from ast import literal_eval
import unittest
from ast import literal_eval
from unittest.mock import MagicMock, patch
from django.test import TestCase, override_settings
@ -765,3 +765,32 @@ class TestCallableSearch(test_resources.BaseEvenniaTest):
ret = self.parser.parse(string, caller=self.char1, return_list=True, raise_errors=True)
self.assertEqual("[]", ret)
def test_search_nested__issue2902(self):
"""
Search for objects by-tag, check that the result is a valid object
"""
# we
parser = funcparser.FuncParser(
{**funcparser.SEARCHING_CALLABLES, **funcparser.FUNCPARSER_CALLABLES}
)
# set up search targets
self.obj1.tags.add("beach", category="zone")
self.obj2.tags.add("beach", category="zone")
# first a plain search
string = "$objlist(beach,category=zone,type=tag)"
ret = parser.parse_to_any(string, caller=self.char1, raise_errors=True)
self.assertEqual(ret, [self.obj1, self.obj2])
# get random result from the possible matches
string = "$choice($objlist(beach,category=zone,type=tag))"
from evennia import set_trace
set_trace()
ret = parser.parse_to_any(string, caller=self.char1, raise_errors=True)
self.assertIn(ret, [self.obj1, self.obj2])