From 05e901e78d97945bdcfbe233cb42a7745594afbb Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 5 Feb 2022 13:32:52 +0000 Subject: [PATCH] devtools.py: add pexit() method, allow args in pmsg() --- mmgen/devtools.py | 12 ++++++++---- mmgen/obj.py | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mmgen/devtools.py b/mmgen/devtools.py index 29ed9d70..52f72d3b 100755 --- a/mmgen/devtools.py +++ b/mmgen/devtools.py @@ -53,13 +53,17 @@ if os.getenv('MMGEN_DEBUG') or os.getenv('MMGEN_TEST_SUITE') or os.getenv('MMGEN print_stack_trace(*args,**kwargs) # Pretty-print any object subclassed from MMGenObject, recursing into sub-objects - WIP - def pmsg(self): - print(self.pfmt()) + def pmsg(self,*args): + print(args[0] if len(args) == 1 else args if args else self.pfmt()) - def pdie(self): - print(self.pfmt()) + def pdie(self,*args): + self.pmsg(*args) sys.exit(1) + def pexit(self,*args): + self.pmsg(*args) + sys.exit(0) + def pfmt(self,lvl=0,id_list=[]): scalars = (str,int,float,Decimal) def do_list(out,e,lvl=0,is_dict=False): diff --git a/mmgen/obj.py b/mmgen/obj.py index 93487e97..a7a5723b 100755 --- a/mmgen/obj.py +++ b/mmgen/obj.py @@ -177,6 +177,7 @@ class MMGenListItem(MMGenObject): 'pfmt', 'pmsg', 'pdie', + 'pexit', 'valid_attrs', 'valid_attrs_extra', 'invalid_attrs',