Merge pull request protocolbuffers#2996 from xfxyjwf/3.3.x

Fix python3 issue.
rmalinowski · Apr 21, 2017 · f418b9e · f418b9e
2 parents 4523c9c + 478119f
commit f418b9e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/python/google/protobuf/descriptor_pool.py b/python/google/protobuf/descriptor_pool.py
@@ -257,7 +257,7 @@ def AddFileDescriptor(self, file_desc):
     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