From b5f4211d5c654a0bbd40f87d381cf7431bb917ac Mon Sep 17 00:00:00 2001
From: Kai Harder <kai.harder@sap.com>
Date: Mon, 1 Dec 2025 06:32:22 +0000
Subject: [PATCH 1/2] Fix docker exec types

---
 stubs/docker/docker/api/exec_api.pyi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/stubs/docker/docker/api/exec_api.pyi b/stubs/docker/docker/api/exec_api.pyi
index 0c50a6091cbe..619603fb6ca5 100644
--- a/stubs/docker/docker/api/exec_api.pyi
+++ b/stubs/docker/docker/api/exec_api.pyi
@@ -32,7 +32,7 @@ class ExecApiMixin:
         stream: bool = False,
         socket: bool = False,
         demux: bool = False,
-    ) -> str: ...
+    ) -> bytes: ...
     @overload
     def exec_start(
         self, exec_id: str, detach: Literal[False], tty: bool, stream: bool, socket: Literal[True], demux: bool = False
@@ -51,7 +51,7 @@ class ExecApiMixin:
     @overload
     def exec_start(
         self, exec_id: str, detach: Literal[False], tty: bool, stream: Literal[True], socket: Literal[False], demux: Literal[True]
-    ) -> CancellableStream[tuple[str | None, str | None]]: ...
+    ) -> CancellableStream[tuple[bytes | None, bytes | None]]: ...
     @overload
     def exec_start(
         self,
@@ -62,7 +62,7 @@ class ExecApiMixin:
         *,
         stream: Literal[True],
         demux: Literal[True],
-    ) -> CancellableStream[tuple[str | None, str | None]]: ...
+    ) -> CancellableStream[tuple[bytes | None, bytes | None]]: ...
     @overload
     def exec_start(
         self,
@@ -72,7 +72,7 @@ class ExecApiMixin:
         stream: Literal[True],
         socket: Literal[False],
         demux: Literal[False],
-    ) -> CancellableStream[str]: ...
+    ) -> CancellableStream[bytes]: ...
     @overload
     def exec_start(
         self,
@@ -83,7 +83,7 @@ class ExecApiMixin:
         stream: Literal[True],
         socket: Literal[False] = False,
         demux: Literal[False] = False,
-    ) -> CancellableStream[str]: ...
+    ) -> CancellableStream[bytes]: ...
     @overload
     def exec_start(
         self,
@@ -93,7 +93,7 @@ class ExecApiMixin:
         stream: Literal[False],
         socket: Literal[False],
         demux: Literal[True],
-    ) -> tuple[str | None, str | None]: ...
+    ) -> tuple[bytes | None, bytes | None]: ...
     @overload
     def exec_start(
         self,
@@ -104,7 +104,7 @@ class ExecApiMixin:
         socket: Literal[False] = False,
         *,
         demux: Literal[True],
-    ) -> tuple[str | None, str | None]: ...
+    ) -> tuple[bytes | None, bytes | None]: ...
     @overload
     def exec_start(
         self,
@@ -114,4 +114,4 @@ class ExecApiMixin:
         stream: Literal[False] = False,
         socket: Literal[False] = False,
         demux: Literal[False] = False,
-    ) -> str: ...
+    ) -> bytes: ...

From 2140200d05d56716ec0d3858901137ae15d678c6 Mon Sep 17 00:00:00 2001
From: Kai Harder <kai.harder@sap.com>
Date: Mon, 1 Dec 2025 17:56:29 +0000
Subject: [PATCH 2/2] Fix

---
 stubs/docker/docker/api/exec_api.pyi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stubs/docker/docker/api/exec_api.pyi b/stubs/docker/docker/api/exec_api.pyi
index 951eef82dac9..a4dcd13a716c 100644
--- a/stubs/docker/docker/api/exec_api.pyi
+++ b/stubs/docker/docker/api/exec_api.pyi
@@ -130,7 +130,7 @@ class ExecApiMixin:
         | _BufferedReaderStream
         | SSHSocket
         | CancellableStream[bytes]
-        | CancellableStream[tuple[str | None, str | None]]
-        | tuple[str | None, str | None]
+        | CancellableStream[tuple[bytes | None, bytes | None]]
+        | tuple[bytes | None, bytes | None]
         | bytes
     ): ...