Skip to content

Move google.protobuf from 2 to 2and3 #2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelleZijlstra merged 3 commits into from
Jun 1, 2018
Merged

Move google.protobuf from 2 to 2and3 #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecdc03e
Move google protobuf from 2 to 2and3
nipunn1313 May 30, 2018
d259572
Convert str to bytes
nipunn1313 May 30, 2018
d6b2c27
repr to use str in google.protobuf.internal.containers
nipunn1313 May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion third_party/2/google/protobuf/__init__.pyi
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions third_party/2/google/protobuf/internal/enum_type_wrapper.pyi
View file
Open in desktop

This file was deleted.

0 third_party/2/google/__init__.pyi → third_party/2and3/google/__init__.pyi
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions third_party/2and3/google/protobuf/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = ... # type: bytes
6 changes: 3 additions & 3 deletions third_party/2/google/protobuf/any_pb2.pyi → ...d_party/2and3/google/protobuf/any_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ from typing import (

class Any(Message, well_known_types.Any_):
type_url = ... # type: Text
value = ... # type: str
value = ... # type: bytes

def __init__(self,
type_url: Optional[Text] = ...,
value: Optional[str] = ...,
value: Optional[bytes] = ...,
) -> None: ...

@classmethod
def FromString(cls, s: str) -> Any: ...
def FromString(cls, s: bytes) -> Any: ...
2 changes: 1 addition & 1 deletion ..._party/2/google/protobuf/any_test_pb2.pyi → ...ty/2and3/google/protobuf/any_test_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ class TestAny(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> TestAny: ...
def FromString(cls, s: bytes) -> TestAny: ...
6 changes: 3 additions & 3 deletions third_party/2/google/protobuf/api_pb2.pyi → ...d_party/2and3/google/protobuf/api_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Api(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> Api: ...
def FromString(cls, s: bytes) -> Api: ...


class Method(Message):
Expand All @@ -71,7 +71,7 @@ class Method(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> Method: ...
def FromString(cls, s: bytes) -> Method: ...


class Mixin(Message):
Expand All @@ -84,4 +84,4 @@ class Mixin(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> Mixin: ...
def FromString(cls, s: bytes) -> Mixin: ...
0 ...y/2/google/protobuf/compiler/__init__.pyi → ...nd3/google/protobuf/compiler/__init__.pyi
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...2/google/protobuf/compiler/plugin_pb2.pyi → ...3/google/protobuf/compiler/plugin_pb2.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Version(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> Version: ...
def FromString(cls, s: bytes) -> Version: ...


class CodeGeneratorRequest(Message):
Expand All @@ -50,7 +50,7 @@ class CodeGeneratorRequest(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> CodeGeneratorRequest: ...
def FromString(cls, s: bytes) -> CodeGeneratorRequest: ...


class CodeGeneratorResponse(Message):
Expand All @@ -67,7 +67,7 @@ class CodeGeneratorResponse(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> CodeGeneratorResponse.File: ...
def FromString(cls, s: bytes) -> CodeGeneratorResponse.File: ...
error = ... # type: Text

@property
Expand All @@ -79,4 +79,4 @@ class CodeGeneratorResponse(Message):
) -> None: ...

@classmethod
def FromString(cls, s: str) -> CodeGeneratorResponse: ...
def FromString(cls, s: bytes) -> CodeGeneratorResponse: ...
2 changes: 1 addition & 1 deletion third_party/2/google/protobuf/descriptor.pyi → ...arty/2and3/google/protobuf/descriptor.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@ class FileDescriptor(DescriptorBase):
def CopyToProto(self, proto): ...

def MakeDescriptor(desc_proto, package=..., build_file_if_cpp=..., syntax=...): ...
def _ParseOptions(message: Message, string: str) -> Message: ...
def _ParseOptions(message: Message, string: bytes) -> Message: ...
Loading