FIX: Address timhoffm review feedback

buddy0452004 · buddy0452004 · commit b23fd27bf5f5 · 2026-04-03T17:13:51.000+05:30
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -144,9 +144,9 @@ def clabel(self, levels=None, *,
         labels
             A list of `.Text` instances for the labels.
 
-            Note: The returned .Text instances should not be individually
-            removed or have their geometry modified. To remove all labels,
-            remove the entire .ContourSet and recreate it.
+            Note: The returned Text instances should not be individually
+            removed or have their geometry modified, e.g. by changing text or font size.
+            If you need such a modification, remove the entire `.ContourSet` and recreate it.
         """
 
         if self.filled:
@@ -518,16 +518,14 @@ def labels(self, inline, inline_spacing):
 
     def remove(self):
         super().remove()
-        for text in list(self.labelTexts):
+        for text in self.labelTexts:
             try:
                 text.remove()
             except ValueError:
-                import warnings
-                warnings.warn(
+                _api.warn_external(
                     "Some labels were manually removed before the ContourSet. "
                     "To remove labels cleanly, remove the entire ContourSet "
-                    "and recreate it.",
-                    UserWarning, stacklevel=2)
+                    "and recreate it.")
         self.labelTexts.clear()
 
 
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -808,9 +808,7 @@ def test_contour_remove_with_labels():
     ax = plt.figure().add_subplot()
     cs = ax.contour(np.arange(16).reshape((4, 4)))
     labels = cs.clabel()
-    for label in labels:
-        label.remove()
-    cs.clabel()
+    labels[0].remove()
     with pytest.warns(UserWarning, match="Some labels were manually removed"):
         cs.remove()
 
