From 041963d5567ed1c4a65f7dac661056cdadd48481 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 1 Nov 2022 14:36:50 +0000 Subject: [PATCH] devinit.py: MMGenObject -> MMGenObjectDevTools --- mmgen/devinit.py | 6 ++++-- mmgen/objmethods.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mmgen/devinit.py b/mmgen/devinit.py index dbe2d796..de55506e 100755 --- a/mmgen/devinit.py +++ b/mmgen/devinit.py @@ -35,7 +35,7 @@ def MMGenObject_call(methodname,*args,**kwargs): from .devtools import MMGenObjectMethods return getattr(MMGenObjectMethods,methodname)(*args,**kwargs) -class MMGenObject: +class MMGenObjectDevTools: pmsg = lambda *args,**kwargs: MMGenObject_call('pmsg',*args,**kwargs) pdie = lambda *args,**kwargs: MMGenObject_call('pdie',*args,**kwargs) @@ -63,6 +63,8 @@ class MMGenObject: def init_dev(): import builtins - setattr(builtins,'MMGenObject',MMGenObject) + # MMGenObject is added to the namespace by objmethods.py, so we must name the builtin differently + # to avoid inadvertently adding MMGenObject to the global namespace here: + setattr(builtins,'MMGenObjectDevTools',MMGenObjectDevTools) for funcname,func in devtools_funcs.items(): setattr(builtins,funcname,func) diff --git a/mmgen/objmethods.py b/mmgen/objmethods.py index 9e21218d..73d93298 100755 --- a/mmgen/objmethods.py +++ b/mmgen/objmethods.py @@ -24,8 +24,8 @@ import unicodedata from .globalvars import g import mmgen.color as color_mod -if 'MMGenObject' in __builtins__: # added to builtins by devinit.init_dev() - MMGenObject = __builtins__['MMGenObject'] +if 'MMGenObjectDevTools' in __builtins__: # added to builtins by devinit.init_dev() + MMGenObject = __builtins__['MMGenObjectDevTools'] else: class MMGenObject: 'placeholder - overridden when testing'