Merge branch 'main' into main

Author: slilonfe5

pyomo/common/enums.py

@@ -42,6 +42,8 @@
 else:
     _EnumType = enum.EnumType
 if sys.version_info[:2] < (3, 13):
+    import inspect
+
     # prior to 3.13 the int.{to,from}_bytes docstrings had LaTeX-like
     # "`..'" quotations, which Sphinx can't parse correctly.
     def _fix_doc(ref):
@@ -53,7 +55,8 @@ def _rewrite(func):
 
     class IntEnum(enum.IntEnum):
         __doc__ = (
-            """A compatibility wrapper around :class:`enum.IntEnum`
+            inspect.cleandoc(
+                """A compatibility wrapper around :class:`enum.IntEnum`
 
         This wrapper class updates the :meth:`to_bytes` and
         :meth:`from_bytes` docstrings in Python <= 3.12 to suppress
@@ -62,7 +65,10 @@ class IntEnum(enum.IntEnum):
         .. rubric:: IntEnum
 
         """
-            + enum.IntEnum.__doc__
+            )
+            + "\n\n"
+            # There are environments where IntEnum.__doc__ is None (see #3710)
+            + inspect.cleandoc(getattr(enum.IntEnum, "__doc__", "") or "")
         )
 
         @_fix_doc(enum.IntEnum.to_bytes)