Merge pull request #2996 from xfxyjwf/3.3.x

Fix python3 issue.
2017-04-20 17:32:48 -07:00 · 2017-04-20 17:32:48 -07:00 · f418b9e3eb
commit f418b9e3eb
parent 4523c9c233 478119fe77
1 changed files with 1 additions and 1 deletions
--- 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