Move to using expr (not body) when gathering variabels from constraints

pyomo/contrib/community_detection/community_graph.py

@@ -123,7 +123,7 @@ def generate_model_graph(
         # Create a list of the variable numbers that occur in the given constraint equation
         numbered_variables_in_constraint_equation = [
             component_number_map[constraint_variable]
-            for constraint_variable in identify_variables(model_constraint.body)
+            for constraint_variable in identify_variables(model_constraint.expr)
         ]
 
         # Update constraint_variable_map

pyomo/contrib/fbbt/fbbt.py

@@ -1576,14 +1576,14 @@ def __init__(self, comp):
         if comp.ctype == Constraint:
             if comp.is_indexed():
                 for c in comp.values():
-                    self._vars.update(identify_variables(c.body))
+                    self._vars.update(identify_variables(c.expr))
             else:
-                self._vars.update(identify_variables(comp.body))
+                self._vars.update(identify_variables(comp.expr))
         else:
             for c in comp.component_data_objects(
                 Constraint, descend_into=True, active=True, sort=True
             ):
-                self._vars.update(identify_variables(c.body))
+                self._vars.update(identify_variables(c.expr))
 
     def save_bounds(self):
         bnds = ComponentMap()

pyomo/util/infeasible.py

@@ -159,7 +159,7 @@ def log_infeasible_constraints(
         if log_variables:
             line += ''.join(
                 f"\n  - VAR {v.name}: {v.value}"
-                for v in identify_variables(constr.body, include_fixed=True)
+                for v in identify_variables(constr.expr, include_fixed=True)
             )
 
         logger.info(line)