From 1c7a6dfd21988bd51ced34a85d7abf8934c70e25 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 27 Sep 2020 11:18:23 +0200 Subject: [PATCH] Cleaner error message passing reserved kwarg to EvMenu --- evennia/utils/evmenu.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py index f60c0138d7..ea61ec11a8 100644 --- a/evennia/utils/evmenu.py +++ b/evennia/utils/evmenu.py @@ -477,7 +477,7 @@ class EvMenu: self.test_nodetext = "" # assign kwargs as initialization vars on ourselves. - if set( + reserved_clash = set( ( "_startnode", "_menutree", @@ -491,9 +491,10 @@ class EvMenu: "cmdset_mergetype", "auto_quit", ) - ).intersection(set(kwargs.keys())): + ).intersection(set(kwargs.keys())) + if reserved_clash: raise RuntimeError( - "One or more of the EvMenu `**kwargs` is reserved by EvMenu for internal use." + f"One or more of the EvMenu `**kwargs` ({list(reserved_clash)}) is reserved by EvMenu for internal use." ) for key, val in kwargs.items(): setattr(self, key, val)