From a5e243fbcd2c6efea933c7eeea527b78c1eb9559 Mon Sep 17 00:00:00 2001
From: Jukka Lehtosalo <jukka.lehtosalo@iki.fi>
Date: Wed, 5 May 2021 09:33:59 +0100
Subject: [PATCH] Change some str types to Text in google.protobuf.text_format
 (#5343)

Python 2 `unicode` values are supported. For example:
https://github.com/protocolbuffers/protobuf/blob/master/python/google/protobuf/text_format.py#L843
---
 stubs/protobuf/google/protobuf/text_format.pyi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/stubs/protobuf/google/protobuf/text_format.pyi b/stubs/protobuf/google/protobuf/text_format.pyi
index 547b80346..472a645ce 100644
--- a/stubs/protobuf/google/protobuf/text_format.pyi
+++ b/stubs/protobuf/google/protobuf/text_format.pyi
@@ -145,7 +145,7 @@ class _Printer:
     def PrintFieldValue(self, field: FieldDescriptor, value: Any) -> None: ...
 
 def Parse(
-    text: Union[str, bytes],
+    text: Union[Text, 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: Union[str, bytes],
+    text: Union[Text, 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[Union[str, bytes]],
+    lines: Iterable[Union[Text, 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[Union[str, bytes]], message: _M) -> _M: ...
-    def MergeLines(self, lines: Iterable[Union[str, bytes]], message: _M) -> _M: ...
+    def ParseLines(self, lines: Iterable[Union[Text, bytes]], message: _M) -> _M: ...
+    def MergeLines(self, lines: Iterable[Union[Text, bytes]], message: _M) -> _M: ...
 
 class Tokenizer:
     token: str = ...