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

Cleaned up KeyErrors and added a funcparser test.

Browse source
This commit is contained in:
Andrew Bastien 2023-11-01 11:13:59 -04:00
parent 5fa11cddb6
commit b975d0fabd
2 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/utils/funcparser.py
View file

@ -1222,10 +1222,7 @@ def funcparser_callable_you(
""" """
if args and mapping: if args and mapping:
# this would mean a $you(key) form # this would mean a $you(key) form
try: caller = mapping.get(args[0], None)
caller = mapping.get(args[0])
except KeyError:
pass
if not (caller and receiver): if not (caller and receiver):
raise ParsingError("No caller or receiver supplied to $you callable.") raise ParsingError("No caller or receiver supplied to $you callable.")
@ -1292,10 +1289,7 @@ def funcparser_callable_your(
""" """
if args and mapping: if args and mapping:
# this would mean a $your(key) form # this would mean a $your(key) form
try: caller = mapping.get(args[0], None)
caller = mapping.get(args[0])
except KeyError:
pass
if not (caller and receiver): if not (caller and receiver):
raise ParsingError("No caller or receiver supplied to $your callable.") raise ParsingError("No caller or receiver supplied to $your callable.")

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

@ -451,6 +451,11 @@ class TestDefaultCallables(TestCase):
"You smile to yourself.", "You smile to yourself.",
"Char1 smiles to herself.", "Char1 smiles to herself.",
), # reverse reference ), # reverse reference
(
"$Your() smile is the greatest ever.",
"Your smile is the greatest ever.",
"Char1's smile is the greatest ever."
),
] ]
) )
def test_conjugate(self, string, expected_you, expected_them): def test_conjugate(self, string, expected_you, expected_them):