Convert from using Undefined class to _UNDEFINED const

OpenMDAO · Aug 14, 2020 · e541545 · e541545
1 parent 71481d3
commit e541545
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/openmdao/utils/testing_utils.py b/openmdao/utils/testing_utils.py
@@ -3,9 +3,6 @@
 
 import numpy as np
 
-from openmdao.solvers.solver import Solver
-from openmdao.utils.options_dictionary import Undefined
-
 
 def _new_setup(self):
     import os
@@ -92,6 +89,4 @@ def default(self, obj):
             return float(obj)
         elif isinstance(obj, np.ndarray):
             return obj.tolist()
-        elif isinstance(obj, Undefined):
-            return "undefined"
         return json.JSONEncoder.default(self, obj)
diff --git a/openmdao/visualization/n2_viewer/n2_viewer.py b/openmdao/visualization/n2_viewer/n2_viewer.py
@@ -28,7 +28,7 @@
 from openmdao.utils.mpi import MPI
 from openmdao.visualization.html_utils import read_files, write_script, DiagramWriter
 from openmdao.utils.general_utils import warn_deprecation
-from openmdao.utils.options_dictionary import Undefined
+from openmdao.core.constants import _UNDEFINED
 
 _IND = 4  # HTML indentation (spaces)
 
@@ -197,7 +197,7 @@ def _get_tree_dict(system, component_execution_orders, component_execution_index
         if k in ['linear_solver', 'nonlinear_solver']:
             options[k] = system.options[k].SOLVER
         else:
-            if isinstance(system.options._dict[k]['value'], Undefined):
+            if system.options._dict[k]['value'] == _UNDEFINED:
                 options[k] = str(system.options._dict[k]['value'])
             else:
                 options[k] = system.options._dict[k]['value']

diff --git a/openmdao/visualization/n2_viewer/tests/betz_tree.json b/openmdao/visualization/n2_viewer/tests/betz_tree.json
@@ -84,7 +84,7 @@
             ],
             "options": {
                 "distributed": false,
-                "name": "undefined",
+                "name": "UNDEFINED",
                 "val": 1.0,
                 "shape": null,
                 "units": null,