Skip to content

protobuf: Fix inadvertently deleted annotations.#3364

Merged
JelleZijlstra merged 2 commits intopython:masterfrom
benjaminp:fix-protobuf
Oct 14, 2019
Merged

protobuf: Fix inadvertently deleted annotations.#3364
JelleZijlstra merged 2 commits intopython:masterfrom
benjaminp:fix-protobuf

Conversation

@benjaminp
Copy link
Contributor

In 036abc7, I meant to delete a lot of FromString() declarations from concrete Message subclasses but also deleted some nearby variable annotations. In this change, I restore the incorrectly deleted annoations.

I apologize from the extra newlines in the change here. I assume everything will soon be blackened, so I didn't invest much effort in getting rid of the newlines.

@JelleZijlstra
Copy link
Member

Unfortunately CI failed because flake8 is unhappy about the blank lines. I wouldn't mind if you just run Black on this directory for this PR if that's easiest for you.

@benjaminp benjaminp changed the title protobuf: Fix inadvertantly deleted annotations. protobuf: Fix inadvertently deleted annotations. Oct 14, 2019
@JelleZijlstra JelleZijlstra merged commit add16d2 into python:master Oct 14, 2019
@benjaminp benjaminp deleted the fix-protobuf branch October 14, 2019 23:13
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.

3 participants