Skip to content

Move google.protobuf from 2 to 2and3 - #2174

Merged
JelleZijlstra merged 3 commits into
python:masterfrom
nipunn1313:mv_google
Jun 1, 2018
Merged

JelleZijlstra merged 3 commits into
python:masterfrom
nipunn1313:mv_google

Conversation

@nipunn1313

Copy link
Copy Markdown
Contributor

In working on nipunn1313/mypy-protobuf#22, we found that the typeshed stubs are (as far as we can tell) accurate for python3. Google's protoc does not generate differently for py2 vs py3, so the stubs should be ok.

I moved the stubs to the 2and3 directory and replaced instances of str with bytes for compatibility.

This should generally be ok. I ran the internal consistency
tests and they seemed to pass.
@JelleZijlstra

Copy link
Copy Markdown
Member

See also #2140.

@JelleZijlstra
JelleZijlstra merged commit b7ee95a into python:master Jun 1, 2018
yedpodtrzitko pushed a commit to yedpodtrzitko/typeshed that referenced this pull request Jan 23, 2019
* Move google protobuf from 2 to 2and3

This should generally be ok. I ran the internal consistency
tests and they seemed to pass.

* Convert str to bytes

* repr to use str in google.protobuf.internal.containers
@nipunn1313
nipunn1313 deleted the mv_google branch July 10, 2021 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants