Cherry-pick fix for compatibility with Python 3.7#5423

acozzette merged 1 commit intoprotocolbuffers:3.6.xprotocolbuffers/protobuf:3.6.xfrom

acozzette:python-3.7-cherry-pickacozzette/protobuf:python-3.7-cherry-pickCopy head branch name to clipboard