From fe4acabdd770c0708cc63f441e347cf8ceea8b9c Mon Sep 17 00:00:00 2001
From: Jukka Lehtosalo <jukka.lehtosalo@iki.fi>
Date: Fri, 30 Apr 2021 14:46:29 +0100
Subject: [PATCH] Allow bytes in addition to str in google.protobuf.text_format
 (#5267)

---
 stubs/protobuf/google/protobuf/text_format.pyi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stubs/protobuf/google/protobuf/text_format.pyi b/stubs/protobuf/google/protobuf/text_format.pyi
index 12c1a9ba0..547b80346 100644
--- a/stubs/protobuf/google/protobuf/text_format.pyi
+++ b/stubs/protobuf/google/protobuf/text_format.pyi
@@ -1,6 +1,6 @@
 import sys
 from _typeshed import SupportsWrite
-from typing import Any, Callable, Iterable, Optional, Text, Tuple, TypeVar
+from typing import Any, Callable, Iterable, Optional, Text, Tuple, TypeVar, Union
 
 from .descriptor import FieldDescriptor
 from .descriptor_pool import DescriptorPool
@@ -145,7 +145,7 @@ class _Printer:
     def PrintFieldValue(self, field: FieldDescriptor, value: Any) -> None: ...
 
 def Parse(
-    text: str,
+    text: Union[str, bytes],
     message: _M,
     allow_unknown_extension: bool = ...,
     allow_field_number: bool = ...,
@@ -153,7 +153,7 @@ def Parse(
     allow_unknown_field: bool = ...,
 ) -> _M: ...
 def Merge(
-    text: str,
+    text: Union[str, bytes],
     message: _M,
     allow_unknown_extension: bool = ...,
     allow_field_number: bool = ...,
@@ -161,7 +161,7 @@ def Merge(
     allow_unknown_field: bool = ...,
 ) -> _M: ...
 def MergeLines(
-    lines: Iterable[str],
+    lines: Iterable[Union[str, bytes]],
     message: _M,
     allow_unknown_extension: bool = ...,
     allow_field_number: bool = ...,
@@ -181,8 +181,8 @@ class _Parser:
         descriptor_pool: Optional[DescriptorPool] = ...,
         allow_unknown_field: bool = ...,
     ) -> None: ...
-    def ParseLines(self, lines: Iterable[str], message: _M) -> _M: ...
-    def MergeLines(self, lines: Iterable[str], message: _M) -> _M: ...
+    def ParseLines(self, lines: Iterable[Union[str, bytes]], message: _M) -> _M: ...
+    def MergeLines(self, lines: Iterable[Union[str, bytes]], message: _M) -> _M: ...
 
 class Tokenizer:
     token: str = ...