Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions modelx/core/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -1354,6 +1354,10 @@ def del_macro(self, name):
macro = self._macros[name]
macro.on_delete()
del self._macros[name]

# Remove from macro namespace if it exists
if self._macro_namespace is not None and name in self._macro_namespace:
del self._macro_namespace[name]

def get_macro_namespace(self):
"""Get the namespace for macro execution
Expand Down
6 changes: 6 additions & 0 deletions modelx/tests/core/model/test_macro.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,15 @@ def to_delete():

assert 'to_delete' in m.macros

# Call macro to ensure namespace is created
m.to_delete()
assert 'to_delete' in m._impl._macro_namespace

del m.to_delete

assert 'to_delete' not in m.macros
# Verify macro is also removed from the namespace (bug fix)
assert 'to_delete' not in m._impl._macro_namespace
with pytest.raises(AttributeError):
m.to_delete()

Expand Down
Loading