Replaced __internal__ argument with warning filters

src/PIL/ImageDraw.py

@@ -32,6 +32,7 @@
 
 import math
 import numbers
+import warnings
 
 from . import Image, ImageColor
 from ._deprecate import deprecate
@@ -375,12 +376,13 @@ class ImageDraw:
 
     def _multiline_spacing(self, font, spacing, stroke_width):
         # this can be replaced with self.textbbox(...)[3] when textsize is removed
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
             return (
                 self.textsize(
                     "A",
                     font=font,
                     stroke_width=stroke_width,
-                __internal__=True,
                 )[1]
                 + spacing
             )
@@ -582,12 +584,12 @@ class ImageDraw:
         features=None,
         language=None,
         stroke_width=0,
-        __internal__=False,
     ):
         """Get the size of a given string, in pixels."""
-        if not __internal__:
         deprecate("textsize", 10, "textbbox or textlength")
         if self._multiline_check(text):
+            with warnings.catch_warnings():
+                warnings.filterwarnings("ignore", category=DeprecationWarning)
                 return self.multiline_textsize(
                     text,
                     font,
@@ -596,18 +598,18 @@ class ImageDraw:
                     features,
                     language,
                     stroke_width,
-                __internal__=True,
                 )
 
         if font is None:
             font = self.getfont()
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
             return font.getsize(
                 text,
                 direction,
                 features,
                 language,
                 stroke_width,
-            __internal__=True,
             )
 
     def multiline_textsize(
@@ -619,13 +621,13 @@ class ImageDraw:
         features=None,
         language=None,
         stroke_width=0,
-        __internal__=False,
     ):
-        if not __internal__:
         deprecate("multiline_textsize", 10, "multiline_textbbox")
         max_width = 0
         lines = self._multiline_split(text)
         line_spacing = self._multiline_spacing(font, spacing, stroke_width)
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
             for line in lines:
                 line_width, line_height = self.textsize(
                     line,
@@ -635,7 +637,6 @@ class ImageDraw:
                     features,
                     language,
                     stroke_width,
-                __internal__=True,
                 )
                 max_width = max(max_width, line_width)
         return max_width, len(lines) * line_spacing - spacing
@@ -662,13 +663,14 @@ class ImageDraw:
             return font.getlength(text, mode, direction, features, language)
         except AttributeError:
             deprecate("textlength support for fonts without getlength", 10)
+            with warnings.catch_warnings():
+                warnings.filterwarnings("ignore", category=DeprecationWarning)
                 size = self.textsize(
                     text,
                     font,
                     direction=direction,
                     features=features,
                     language=language,
-                __internal__=True,
                 )
             if direction == "ttb":
                 return size[1]

src/PIL/ImageDraw2.py

@@ -24,6 +24,8 @@
 """
 
 
+import warnings
+
 from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath
 from ._deprecate import deprecate
 
@@ -180,7 +182,9 @@ class Draw:
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textsize`
         """
         deprecate("textsize", 10, "textbbox or textlength")
-        return self.draw.textsize(text, font=font.font, __internal__=True)
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
+            return self.draw.textsize(text, font=font.font)
 
     def textbbox(self, xy, text, font):
         """

src/PIL/ImageFont.py

@@ -147,7 +147,6 @@ class ImageFont:
 
         :return: (width, height)
         """
-        if not kwargs.get("__internal__"):
         deprecate("getsize", 10, "getbbox or getlength")
         return self.font.getsize(text)
 
@@ -425,7 +424,6 @@ class FreeTypeFont:
         features=None,
         language=None,
         stroke_width=0,
-        __internal__=False,
     ):
         """
         .. deprecated:: 9.2.0
@@ -479,7 +477,6 @@ class FreeTypeFont:
 
         :return: (width, height)
         """
-        if not __internal__:
         deprecate("getsize", 10, "getbbox or getlength")
         # vertical offset is added for historical reasons
         # see https://github.com/python-pillow/Pillow/pull/4910#discussion_r486682929
@@ -545,12 +542,12 @@ class FreeTypeFont:
         deprecate("getsize_multiline", 10, "ImageDraw.multiline_textbbox")
         max_width = 0
         lines = self._multiline_split(text)
-        line_spacing = (
+        with warnings.catch_warnings():
-            self.getsize("A", stroke_width=stroke_width, __internal__=True)[1] + spacing
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
-        )
+            line_spacing = self.getsize("A", stroke_width=stroke_width)[1] + spacing
             for line in lines:
                 line_width, line_height = self.getsize(
-                line, direction, features, language, stroke_width, __internal__=True
+                    line, direction, features, language, stroke_width
                 )
                 max_width = max(max_width, line_width)
 
@@ -856,11 +853,9 @@ class TransposedFont:
 
         Use :py:meth:`.getbbox` or :py:meth:`.getlength` instead.
         """
-        if not kwargs.get("__internal__"):
         deprecate("getsize", 10, "getbbox or getlength")
-        try:
+        with warnings.catch_warnings():
-            w, h = self.font.getsize(text, __internal__=True)
+            warnings.filterwarnings("ignore", category=DeprecationWarning)
-        except TypeError:
             w, h = self.font.getsize(text)
         if self.orientation in (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270):
             return h, w