Update remaining patches

Author: cdce8p

misc/typeshed_patches/0001-Partially-revert-Clean-up-argparse-hacks.patch

@@ -1,4 +1,4 @@
-From b5f2cc9633f9f6cd9326eee96a32efb3aff70701 Mon Sep 17 00:00:00 2001
+From f12b57ec89a6431737e4f473cecabf0d350b0d46 Mon Sep 17 00:00:00 2001
 From: Marc Mueller <[email protected]>
 Date: Sat, 15 Feb 2025 20:11:06 +0100
 Subject: [PATCH] Partially revert Clean up argparse hacks
@@ -8,7 +8,7 @@ Subject: [PATCH] Partially revert Clean up argparse hacks
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/argparse.pyi b/mypy/typeshed/stdlib/argparse.pyi
-index 029bfeefe..9dbd8c308 100644
+index 32beaff14..e97a2d2e1 100644
 --- a/mypy/typeshed/stdlib/argparse.pyi
 +++ b/mypy/typeshed/stdlib/argparse.pyi
 @@ -2,7 +2,7 @@ import sys
@@ -20,7 +20,7 @@ index 029bfeefe..9dbd8c308 100644
  from typing_extensions import Self, TypeAlias, deprecated
 
  __all__ = [
-@@ -38,7 +38,9 @@ ONE_OR_MORE: Final = "+"
+@@ -36,7 +36,9 @@ ONE_OR_MORE: Final = "+"
  OPTIONAL: Final = "?"
  PARSER: Final = "A..."
  REMAINDER: Final = "..."
@@ -31,7 +31,7 @@ index 029bfeefe..9dbd8c308 100644
  ZERO_OR_MORE: Final = "*"
  _UNRECOGNIZED_ARGS_ATTR: Final = "_unrecognized_args"  # undocumented
 
-@@ -81,7 +83,7 @@ class _ActionsContainer:
+@@ -79,7 +81,7 @@ class _ActionsContainer:
          # more precisely, Literal["?", "*", "+", "...", "A...", "==SUPPRESS=="],
          # but using this would make it hard to annotate callers that don't use a
          # literal argument and for subclasses to override this method.
@@ -41,5 +41,5 @@ index 029bfeefe..9dbd8c308 100644
          default: Any = ...,
          type: _ActionType = ...,
 -- 
-2.48.1
+2.49.0
 

misc/typeshed_patches/0001-Revert-sum-literal-integer-change-13961.patch

@@ -1,4 +1,4 @@
-From 58c6a6ab863c1c38e95ccafaf13792ed9c00e499 Mon Sep 17 00:00:00 2001
+From ea30f4a61c9b4094519d02b4793cee5ad2ba6b54 Mon Sep 17 00:00:00 2001
 From: Shantanu <[email protected]>
 Date: Sat, 29 Oct 2022 12:47:21 -0700
 Subject: [PATCH] Revert sum literal integer change (#13961)
@@ -19,10 +19,10 @@ within mypy, I might pursue upstreaming this in typeshed.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mypy/typeshed/stdlib/builtins.pyi b/mypy/typeshed/stdlib/builtins.pyi
-index ea9f8c894..a6065cc67 100644
+index e45967e10..e9b0d51eb 100644
 --- a/mypy/typeshed/stdlib/builtins.pyi
 +++ b/mypy/typeshed/stdlib/builtins.pyi
-@@ -1653,7 +1653,7 @@ _SupportsSumNoDefaultT = TypeVar("_SupportsSumNoDefaultT", bound=_SupportsSumWit
+@@ -1686,7 +1686,7 @@ _SupportsSumNoDefaultT = TypeVar("_SupportsSumNoDefaultT", bound=_SupportsSumWit
  # without creating many false-positive errors (see #7578).
  # Instead, we special-case the most common examples of this: bool and literal integers.
  @overload
@@ -32,5 +32,5 @@ index ea9f8c894..a6065cc67 100644
  def sum(iterable: Iterable[_SupportsSumNoDefaultT], /) -> _SupportsSumNoDefaultT | Literal[0]: ...
  @overload
 -- 
-2.46.0
+2.49.0
 

misc/typeshed_patches/0001-Revert-typeshed-ctypes-change.patch

@@ -1,4 +1,4 @@
-From 61a490091d7c941780919660dc4fdfa88ae6474a Mon Sep 17 00:00:00 2001
+From 59b3ec786214d308b6e6950b1cfa2d6266967174 Mon Sep 17 00:00:00 2001
 From: AlexWaygood <[email protected]>
 Date: Mon, 1 May 2023 20:34:55 +0100
 Subject: [PATCH] Revert typeshed ctypes change Since the plugin provides
@@ -11,10 +11,10 @@ Subject: [PATCH] Revert typeshed ctypes change Since the plugin provides
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/mypy/typeshed/stdlib/_ctypes.pyi b/mypy/typeshed/stdlib/_ctypes.pyi
-index 60bbc51d9..cf9cb81a4 100644
+index 4cbb030bb..6b79b9ff0 100644
 --- a/mypy/typeshed/stdlib/_ctypes.pyi
 +++ b/mypy/typeshed/stdlib/_ctypes.pyi
-@@ -169,11 +169,7 @@ class Array(_CData, Generic[_CT]):
+@@ -284,11 +284,7 @@ class Array(_CData, Generic[_CT], metaclass=_PyCArrayType):
      def _type_(self) -> type[_CT]: ...
      @_type_.setter
      def _type_(self, value: type[_CT]) -> None: ...
@@ -25,8 +25,8 @@ index 60bbc51d9..cf9cb81a4 100644
 -    def raw(self, value: ReadableBuffer) -> None: ...
 +    raw: bytes  # Note: only available if _CT == c_char
      value: Any  # Note: bytes if _CT == c_char, str if _CT == c_wchar, unavailable otherwise
-     # TODO These methods cannot be annotated correctly at the moment.
+     # TODO: These methods cannot be annotated correctly at the moment.
      # All of these "Any"s stand for the array's element type, but it's not possible to use _CT
 -- 
-2.39.3 (Apple Git-146)
+2.49.0