Merge branch 'main' into importlib_update

IDAES · Feb 14, 2025 · 0e36cfe · 0e36cfe
2 parents c63ac1e + 997c3a5
commit 0e36cfe
Show file tree

Hide file tree

Showing 6 changed files with 740 additions and 5 deletions.
diff --git a/.pylint/idaes_transform.py b/.pylint/idaes_transform.py
@@ -188,7 +188,10 @@ def disable_attr_checks_on_slots(node: astroid.ClassDef):
     # overrides the "strict" semantics of having __slots__ defined
     # NOTE to be extra defensive, we should probably make sure that there are
     # no __slots__ defined throughout the complete class hierarchy as well
-    del node.locals["__slots__"]
+    try:
+        del node.locals["__slots__"]
+    except KeyError as e:
+        pass
 
 
 def has_conditional_instantiation(node: astroid.ClassDef, context=None):

diff --git a/idaes/core/base/flowsheet_model.py b/idaes/core/base/flowsheet_model.py
@@ -74,9 +74,7 @@ def __init__(self):
             self.visualize = self._visualize_null
             self.installed = False
         else:
-            # FIXME the explicit submodule import is needed because the idaes_ui doesn't import its fv submodule
-            # otherwise, you get "AttributeError: module 'idaes_ui' has no 'fv' attribute"
-            import idaes_ui.fv
+            import idaes_ui
 
             self.visualize = idaes_ui.fv.visualize
             self.installed = True