diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-04-20 17:32:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 17:32:48 -0700 |
commit | f418b9e3eb2c986c914ada1869572dd47963ba0d (patch) | |
tree | 03c358443c52c9ccc1af467be9994b99276b6c4a | |
parent | 4523c9c233dbb61d03996a5bbe25d1b5aea51f7f (diff) | |
parent | 478119fe77d8a11df83125e872d9f73afe353bf1 (diff) | |
download | protobuf-f418b9e3eb2c986c914ada1869572dd47963ba0d.tar.gz protobuf-f418b9e3eb2c986c914ada1869572dd47963ba0d.tar.bz2 protobuf-f418b9e3eb2c986c914ada1869572dd47963ba0d.zip |
Merge pull request #2996 from xfxyjwf/3.3.x
Fix python3 issue.
-rw-r--r-- | python/google/protobuf/descriptor_pool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/descriptor_pool.py b/python/google/protobuf/descriptor_pool.py index 7bd2506b..29e9f1e3 100644 --- a/python/google/protobuf/descriptor_pool.py +++ b/python/google/protobuf/descriptor_pool.py @@ -257,7 +257,7 @@ class DescriptorPool(object): self._AddFileDescriptor(file_desc) # TODO(jieluo): This is a temporary solution for FieldDescriptor.file. # Remove it when FieldDescriptor.file is added in code gen. - for extension in file_desc.extensions_by_name.itervalues(): + for extension in file_desc.extensions_by_name.values(): self._file_desc_by_toplevel_extension[ extension.full_name] = file_desc |