fix Surface->surface, Surface-w/h->Surface.w/h

Author: damusss

buildconfig/stubs/pygame/surface.pyi

@@ -132,7 +132,7 @@ class Surface:
         self,
         size: Point,
         flags: int = 0,
-        Surface: Surface = ...,
+        surface: Surface = ...,
     ) -> None: ...
     def __copy__(self) -> Surface: ...
     def __deepcopy__(self, memo) -> Surface: ...
@@ -283,7 +283,7 @@ class Surface:
         """
 
     @overload
-    def convert(self, Surface: Surface, /) -> Surface: ...
+    def convert(self, surface: Surface, /) -> Surface: ...
     @overload
     def convert(self, depth: int, flags: int = 0, /) -> Surface: ...
     @overload
@@ -913,22 +913,22 @@ class Surface:
         information is given. A ``ValueError`` is raised if the Surface's pixels
         are discontinuous.
 
-        '1' returns a (Surface-width * Surface-height) array of continuous
+        '1' returns a (Surface.width * Surface.height) array of continuous
         pixels. A ``ValueError`` is raised if the Surface pixels are
         discontinuous.
 
-        '2' returns a (Surface-width, Surface-height) array of raw pixels.
+        '2' returns a (Surface.width, Surface.height) array of raw pixels.
         The pixels are Surface-bytesize-d unsigned integers. The pixel format is
         Surface specific. The 3 byte unsigned integers of 24 bit Surfaces are
         unlikely accepted by anything other than other pygame functions.
 
-        '3' returns a (Surface-width, Surface-height, 3) array of ``RGB`` color
+        '3' returns a (Surface.width, Surface.height, 3) array of ``RGB`` color
         components. Each of the red, green, and blue components are unsigned
         bytes. Only 24-bit and 32-bit Surfaces are supported. The color
         components must be in either ``RGB`` or ``BGR`` order within the pixel.
 
         'r' for red, 'g' for green, 'b' for blue, and 'a' for alpha return a
-        (Surface-width, Surface-height) view of a single color component within a
+        (Surface.width, Surface.height) view of a single color component within a
         Surface: a color plane. Color components are unsigned bytes. Both 24-bit
         and 32-bit Surfaces support 'r', 'g', and 'b'. Only 32-bit Surfaces with
         ``SRCALPHA`` support 'a'.

src_c/doc/surface_doc.h

@@ -1,9 +1,9 @@
 /* Auto generated file: with make_docs.py .  Docs go in docs/reST/ref/ . */
-#define DOC_SURFACE "Surface(size, flags=0, depth=0, masks=None) -> Surface\nSurface(size, flags=0, Surface=...) -> Surface\nPygame object for representing images."
+#define DOC_SURFACE "Surface(size, flags=0, depth=0, masks=None) -> Surface\nSurface(size, flags=0, surface=...) -> Surface\nPygame object for representing images."
 #define DOC_SURFACE_BLIT "blit(source, dest=(0, 0), area=None, special_flags=0) -> Rect\nDraw another Surface onto this one."
 #define DOC_SURFACE_BLITS "blits(blit_sequence, doreturn=1) -> Union[list[Rect], None]\nDraw many Surfaces onto this Surface at their corresponding location."
 #define DOC_SURFACE_FBLITS "fblits(blit_sequence, special_flags=0, /) -> None\nDraw many Surfaces onto this Surface at their corresponding location and with the same special_flags."
-#define DOC_SURFACE_CONVERT "convert(Surface, /) -> Surface.convert.Surface\nconvert(depth, flags=0, /) -> Surface\nconvert(masks, flags=0, /) -> Surface\nconvert() -> Surface\nChange the pixel format of a Surface."
+#define DOC_SURFACE_CONVERT "convert(surface, /) -> Surface\nconvert(depth, flags=0, /) -> Surface\nconvert(masks, flags=0, /) -> Surface\nconvert() -> Surface\nChange the pixel format of a Surface."
 #define DOC_SURFACE_CONVERTALPHA "convert_alpha() -> Surface\nChange the pixel format of a Surface including per pixel alphas."
 #define DOC_SURFACE_COPY "copy() -> Surface\nCreate a new copy of a Surface."
 #define DOC_SURFACE_FILL "fill(color, rect=None, special_flags=0) -> Rect\nFill Surface with a solid color."