From 06fd6fa850304a585e5dddd099c6acf21f249525 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Fri, 15 Jan 2016 17:26:44 -0800
Subject: [PATCH] Fixed Python 3.x C++ build, and updated conformance failure
 lists.

---
 conformance/failure_list_python.txt           | 92 +------------------
 conformance/failure_list_python_cpp.txt       | 92 +------------------
 python/google/protobuf/pyext/map_container.cc |  2 +-
 3 files changed, 5 insertions(+), 181 deletions(-)

diff --git a/conformance/failure_list_python.txt b/conformance/failure_list_python.txt
index c99345988e..d2e52637bd 100644
--- a/conformance/failure_list_python.txt
+++ b/conformance/failure_list_python.txt
@@ -3,11 +3,10 @@ DurationProtoInputTooSmall.JsonOutput
 FieldMaskNumbersDontRoundTrip.JsonOutput
 FieldMaskPathsDontRoundTrip.JsonOutput
 FieldMaskTooManyUnderscore.JsonOutput
-JsonInput.AllFieldAcceptNull.JsonOutput
 JsonInput.Any.JsonOutput
+JsonInput.Any.ProtobufOutput
 JsonInput.AnyNested.JsonOutput
 JsonInput.AnyNested.ProtobufOutput
-JsonInput.Any.ProtobufOutput
 JsonInput.AnyUnorderedTypeTag.JsonOutput
 JsonInput.AnyUnorderedTypeTag.ProtobufOutput
 JsonInput.AnyWithDuration.JsonOutput
@@ -24,132 +23,50 @@ JsonInput.AnyWithValueForInteger.JsonOutput
 JsonInput.AnyWithValueForInteger.ProtobufOutput
 JsonInput.AnyWithValueForJsonObject.JsonOutput
 JsonInput.AnyWithValueForJsonObject.ProtobufOutput
-JsonInput.BoolFieldFalse.JsonOutput
-JsonInput.BoolFieldTrue.JsonOutput
-JsonInput.BoolMapEscapedKey.JsonOutput
-JsonInput.BoolMapField.JsonOutput
 JsonInput.BytesFieldInvalidBase64Characters
-JsonInput.BytesField.JsonOutput
-JsonInput.BytesRepeatedField.JsonOutput
-JsonInput.DoubleFieldInfinity.JsonOutput
 JsonInput.DoubleFieldInfinityNotQuoted
-JsonInput.DoubleFieldMaxNegativeValue.JsonOutput
-JsonInput.DoubleFieldMaxPositiveValue.JsonOutput
-JsonInput.DoubleFieldMinNegativeValue.JsonOutput
-JsonInput.DoubleFieldMinPositiveValue.JsonOutput
-JsonInput.DoubleFieldNan.JsonOutput
 JsonInput.DoubleFieldNanNotQuoted
-JsonInput.DoubleFieldNegativeInfinity.JsonOutput
 JsonInput.DoubleFieldNegativeInfinityNotQuoted
-JsonInput.DoubleFieldQuotedValue.JsonOutput
 JsonInput.DoubleFieldTooSmall
 JsonInput.DurationJsonInputTooLarge
 JsonInput.DurationJsonInputTooSmall
-JsonInput.DurationMaxValue.JsonOutput
-JsonInput.DurationMinValue.JsonOutput
 JsonInput.DurationMissingS
-JsonInput.DurationRepeatedValue.JsonOutput
-JsonInput.EnumField.JsonOutput
 JsonInput.EnumFieldNumericValueNonZero.JsonOutput
 JsonInput.EnumFieldNumericValueNonZero.ProtobufOutput
 JsonInput.EnumFieldNumericValueZero.JsonOutput
 JsonInput.EnumFieldNumericValueZero.ProtobufOutput
 JsonInput.EnumFieldUnknownValue.Validator
-JsonInput.EnumRepeatedField.JsonOutput
-JsonInput.FieldMaskInvalidCharacter
-JsonInput.FieldMask.JsonOutput
 JsonInput.FieldMask.ProtobufOutput
-JsonInput.FieldNameEscaped.JsonOutput
+JsonInput.FieldMaskInvalidCharacter
 JsonInput.FieldNameInLowerCamelCase.Validator
 JsonInput.FieldNameInSnakeCase.JsonOutput
 JsonInput.FieldNameInSnakeCase.ProtobufOutput
-JsonInput.FieldNameWithMixedCases.JsonOutput
-JsonInput.FieldNameWithNumbers.JsonOutput
-JsonInput.FloatFieldInfinity.JsonOutput
 JsonInput.FloatFieldInfinityNotQuoted
-JsonInput.FloatFieldMaxNegativeValue.JsonOutput
-JsonInput.FloatFieldMaxPositiveValue.JsonOutput
-JsonInput.FloatFieldMinNegativeValue.JsonOutput
-JsonInput.FloatFieldMinPositiveValue.JsonOutput
-JsonInput.FloatFieldNan.JsonOutput
 JsonInput.FloatFieldNanNotQuoted
-JsonInput.FloatFieldNegativeInfinity.JsonOutput
 JsonInput.FloatFieldNegativeInfinityNotQuoted
-JsonInput.FloatFieldQuotedValue.JsonOutput
 JsonInput.FloatFieldTooLarge
 JsonInput.FloatFieldTooSmall
-JsonInput.HelloWorld.JsonOutput
 JsonInput.Int32FieldExponentialFormat.JsonOutput
 JsonInput.Int32FieldExponentialFormat.ProtobufOutput
 JsonInput.Int32FieldFloatTrailingZero.JsonOutput
 JsonInput.Int32FieldFloatTrailingZero.ProtobufOutput
 JsonInput.Int32FieldMaxFloatValue.JsonOutput
 JsonInput.Int32FieldMaxFloatValue.ProtobufOutput
-JsonInput.Int32FieldMaxValue.JsonOutput
 JsonInput.Int32FieldMinFloatValue.JsonOutput
 JsonInput.Int32FieldMinFloatValue.ProtobufOutput
 JsonInput.Int32FieldMinValue.JsonOutput
-JsonInput.Int32FieldStringValueEscaped.JsonOutput
-JsonInput.Int32FieldStringValue.JsonOutput
-JsonInput.Int32MapEscapedKey.JsonOutput
-JsonInput.Int32MapField.JsonOutput
-JsonInput.Int64FieldMaxValue.JsonOutput
-JsonInput.Int64FieldMaxValueNotQuoted.JsonOutput
-JsonInput.Int64FieldMinValue.JsonOutput
-JsonInput.Int64FieldMinValueNotQuoted.JsonOutput
-JsonInput.Int64MapEscapedKey.JsonOutput
-JsonInput.Int64MapField.JsonOutput
-JsonInput.MessageField.JsonOutput
-JsonInput.MessageMapField.JsonOutput
-JsonInput.MessageRepeatedField.JsonOutput
-JsonInput.OptionalBoolWrapper.JsonOutput
-JsonInput.OptionalBytesWrapper.JsonOutput
-JsonInput.OptionalDoubleWrapper.JsonOutput
-JsonInput.OptionalFloatWrapper.JsonOutput
-JsonInput.OptionalInt32Wrapper.JsonOutput
-JsonInput.OptionalInt64Wrapper.JsonOutput
-JsonInput.OptionalStringWrapper.JsonOutput
-JsonInput.OptionalUint32Wrapper.JsonOutput
-JsonInput.OptionalUint64Wrapper.JsonOutput
-JsonInput.OptionalWrapperTypesWithNonDefaultValue.JsonOutput
 JsonInput.OriginalProtoFieldName.JsonOutput
 JsonInput.OriginalProtoFieldName.ProtobufOutput
-JsonInput.PrimitiveRepeatedField.JsonOutput
-JsonInput.RepeatedBoolWrapper.JsonOutput
-JsonInput.RepeatedBytesWrapper.JsonOutput
-JsonInput.RepeatedDoubleWrapper.JsonOutput
 JsonInput.RepeatedFieldMessageElementIsNull
 JsonInput.RepeatedFieldPrimitiveElementIsNull
 JsonInput.RepeatedFieldWrongElementTypeExpectingIntegersGotBool
-JsonInput.RepeatedFloatWrapper.JsonOutput
-JsonInput.RepeatedInt32Wrapper.JsonOutput
-JsonInput.RepeatedInt64Wrapper.JsonOutput
-JsonInput.RepeatedStringWrapper.JsonOutput
-JsonInput.RepeatedUint32Wrapper.JsonOutput
-JsonInput.RepeatedUint64Wrapper.JsonOutput
-JsonInput.StringFieldEscape.JsonOutput
-JsonInput.StringField.JsonOutput
 JsonInput.StringFieldSurrogatePair.JsonOutput
-JsonInput.StringFieldUnicodeEscape.JsonOutput
-JsonInput.StringFieldUnicodeEscapeWithLowercaseHexLetters.JsonOutput
-JsonInput.StringFieldUnicode.JsonOutput
 JsonInput.StringFieldUnpairedLowSurrogate
-JsonInput.StringRepeatedField.JsonOutput
 JsonInput.Struct.JsonOutput
 JsonInput.Struct.ProtobufOutput
 JsonInput.TimestampJsonInputLowercaseT
-JsonInput.TimestampMaxValue.JsonOutput
-JsonInput.TimestampMinValue.JsonOutput
-JsonInput.TimestampRepeatedValue.JsonOutput
-JsonInput.TimestampWithNegativeOffset.JsonOutput
-JsonInput.TimestampWithPositiveOffset.JsonOutput
 JsonInput.Uint32FieldMaxFloatValue.JsonOutput
 JsonInput.Uint32FieldMaxFloatValue.ProtobufOutput
-JsonInput.Uint32FieldMaxValue.JsonOutput
-JsonInput.Uint32MapField.JsonOutput
-JsonInput.Uint64FieldMaxValue.JsonOutput
-JsonInput.Uint64FieldMaxValueNotQuoted.JsonOutput
-JsonInput.Uint64MapField.JsonOutput
 JsonInput.ValueAcceptBool.JsonOutput
 JsonInput.ValueAcceptBool.ProtobufOutput
 JsonInput.ValueAcceptFloat.JsonOutput
@@ -164,10 +81,5 @@ JsonInput.ValueAcceptObject.JsonOutput
 JsonInput.ValueAcceptObject.ProtobufOutput
 JsonInput.ValueAcceptString.JsonOutput
 JsonInput.ValueAcceptString.ProtobufOutput
-JsonInput.WrapperTypesWithNullValue.JsonOutput
-ProtobufInput.DoubleFieldNormalizeQuietNan.JsonOutput
-ProtobufInput.DoubleFieldNormalizeSignalingNan.JsonOutput
-ProtobufInput.FloatFieldNormalizeQuietNan.JsonOutput
-ProtobufInput.FloatFieldNormalizeSignalingNan.JsonOutput
 TimestampProtoInputTooLarge.JsonOutput
 TimestampProtoInputTooSmall.JsonOutput
diff --git a/conformance/failure_list_python_cpp.txt b/conformance/failure_list_python_cpp.txt
index 9c710e99c7..7b5e45f9ff 100644
--- a/conformance/failure_list_python_cpp.txt
+++ b/conformance/failure_list_python_cpp.txt
@@ -12,11 +12,10 @@ DurationProtoInputTooSmall.JsonOutput
 FieldMaskNumbersDontRoundTrip.JsonOutput
 FieldMaskPathsDontRoundTrip.JsonOutput
 FieldMaskTooManyUnderscore.JsonOutput
-JsonInput.AllFieldAcceptNull.JsonOutput
 JsonInput.Any.JsonOutput
+JsonInput.Any.ProtobufOutput
 JsonInput.AnyNested.JsonOutput
 JsonInput.AnyNested.ProtobufOutput
-JsonInput.Any.ProtobufOutput
 JsonInput.AnyUnorderedTypeTag.JsonOutput
 JsonInput.AnyUnorderedTypeTag.ProtobufOutput
 JsonInput.AnyWithDuration.JsonOutput
@@ -33,132 +32,50 @@ JsonInput.AnyWithValueForInteger.JsonOutput
 JsonInput.AnyWithValueForInteger.ProtobufOutput
 JsonInput.AnyWithValueForJsonObject.JsonOutput
 JsonInput.AnyWithValueForJsonObject.ProtobufOutput
-JsonInput.BoolFieldFalse.JsonOutput
-JsonInput.BoolFieldTrue.JsonOutput
-JsonInput.BoolMapEscapedKey.JsonOutput
-JsonInput.BoolMapField.JsonOutput
 JsonInput.BytesFieldInvalidBase64Characters
-JsonInput.BytesField.JsonOutput
-JsonInput.BytesRepeatedField.JsonOutput
-JsonInput.DoubleFieldInfinity.JsonOutput
 JsonInput.DoubleFieldInfinityNotQuoted
-JsonInput.DoubleFieldMaxNegativeValue.JsonOutput
-JsonInput.DoubleFieldMaxPositiveValue.JsonOutput
-JsonInput.DoubleFieldMinNegativeValue.JsonOutput
-JsonInput.DoubleFieldMinPositiveValue.JsonOutput
-JsonInput.DoubleFieldNan.JsonOutput
 JsonInput.DoubleFieldNanNotQuoted
-JsonInput.DoubleFieldNegativeInfinity.JsonOutput
 JsonInput.DoubleFieldNegativeInfinityNotQuoted
-JsonInput.DoubleFieldQuotedValue.JsonOutput
 JsonInput.DoubleFieldTooSmall
 JsonInput.DurationJsonInputTooLarge
 JsonInput.DurationJsonInputTooSmall
-JsonInput.DurationMaxValue.JsonOutput
-JsonInput.DurationMinValue.JsonOutput
 JsonInput.DurationMissingS
-JsonInput.DurationRepeatedValue.JsonOutput
-JsonInput.EnumField.JsonOutput
 JsonInput.EnumFieldNumericValueNonZero.JsonOutput
 JsonInput.EnumFieldNumericValueNonZero.ProtobufOutput
 JsonInput.EnumFieldNumericValueZero.JsonOutput
 JsonInput.EnumFieldNumericValueZero.ProtobufOutput
 JsonInput.EnumFieldUnknownValue.Validator
-JsonInput.EnumRepeatedField.JsonOutput
-JsonInput.FieldMaskInvalidCharacter
-JsonInput.FieldMask.JsonOutput
 JsonInput.FieldMask.ProtobufOutput
-JsonInput.FieldNameEscaped.JsonOutput
+JsonInput.FieldMaskInvalidCharacter
 JsonInput.FieldNameInLowerCamelCase.Validator
 JsonInput.FieldNameInSnakeCase.JsonOutput
 JsonInput.FieldNameInSnakeCase.ProtobufOutput
-JsonInput.FieldNameWithMixedCases.JsonOutput
-JsonInput.FieldNameWithNumbers.JsonOutput
-JsonInput.FloatFieldInfinity.JsonOutput
 JsonInput.FloatFieldInfinityNotQuoted
-JsonInput.FloatFieldMaxNegativeValue.JsonOutput
-JsonInput.FloatFieldMaxPositiveValue.JsonOutput
-JsonInput.FloatFieldMinNegativeValue.JsonOutput
-JsonInput.FloatFieldMinPositiveValue.JsonOutput
-JsonInput.FloatFieldNan.JsonOutput
 JsonInput.FloatFieldNanNotQuoted
-JsonInput.FloatFieldNegativeInfinity.JsonOutput
 JsonInput.FloatFieldNegativeInfinityNotQuoted
-JsonInput.FloatFieldQuotedValue.JsonOutput
 JsonInput.FloatFieldTooLarge
 JsonInput.FloatFieldTooSmall
-JsonInput.HelloWorld.JsonOutput
 JsonInput.Int32FieldExponentialFormat.JsonOutput
 JsonInput.Int32FieldExponentialFormat.ProtobufOutput
 JsonInput.Int32FieldFloatTrailingZero.JsonOutput
 JsonInput.Int32FieldFloatTrailingZero.ProtobufOutput
 JsonInput.Int32FieldMaxFloatValue.JsonOutput
 JsonInput.Int32FieldMaxFloatValue.ProtobufOutput
-JsonInput.Int32FieldMaxValue.JsonOutput
 JsonInput.Int32FieldMinFloatValue.JsonOutput
 JsonInput.Int32FieldMinFloatValue.ProtobufOutput
 JsonInput.Int32FieldMinValue.JsonOutput
-JsonInput.Int32FieldStringValueEscaped.JsonOutput
-JsonInput.Int32FieldStringValue.JsonOutput
-JsonInput.Int32MapEscapedKey.JsonOutput
-JsonInput.Int32MapField.JsonOutput
-JsonInput.Int64FieldMaxValue.JsonOutput
-JsonInput.Int64FieldMaxValueNotQuoted.JsonOutput
-JsonInput.Int64FieldMinValue.JsonOutput
-JsonInput.Int64FieldMinValueNotQuoted.JsonOutput
-JsonInput.Int64MapEscapedKey.JsonOutput
-JsonInput.Int64MapField.JsonOutput
-JsonInput.MessageField.JsonOutput
-JsonInput.MessageMapField.JsonOutput
-JsonInput.MessageRepeatedField.JsonOutput
-JsonInput.OptionalBoolWrapper.JsonOutput
-JsonInput.OptionalBytesWrapper.JsonOutput
-JsonInput.OptionalDoubleWrapper.JsonOutput
-JsonInput.OptionalFloatWrapper.JsonOutput
-JsonInput.OptionalInt32Wrapper.JsonOutput
-JsonInput.OptionalInt64Wrapper.JsonOutput
-JsonInput.OptionalStringWrapper.JsonOutput
-JsonInput.OptionalUint32Wrapper.JsonOutput
-JsonInput.OptionalUint64Wrapper.JsonOutput
-JsonInput.OptionalWrapperTypesWithNonDefaultValue.JsonOutput
 JsonInput.OriginalProtoFieldName.JsonOutput
 JsonInput.OriginalProtoFieldName.ProtobufOutput
-JsonInput.PrimitiveRepeatedField.JsonOutput
-JsonInput.RepeatedBoolWrapper.JsonOutput
-JsonInput.RepeatedBytesWrapper.JsonOutput
-JsonInput.RepeatedDoubleWrapper.JsonOutput
 JsonInput.RepeatedFieldMessageElementIsNull
 JsonInput.RepeatedFieldPrimitiveElementIsNull
 JsonInput.RepeatedFieldWrongElementTypeExpectingIntegersGotBool
-JsonInput.RepeatedFloatWrapper.JsonOutput
-JsonInput.RepeatedInt32Wrapper.JsonOutput
-JsonInput.RepeatedInt64Wrapper.JsonOutput
-JsonInput.RepeatedStringWrapper.JsonOutput
-JsonInput.RepeatedUint32Wrapper.JsonOutput
-JsonInput.RepeatedUint64Wrapper.JsonOutput
-JsonInput.StringFieldEscape.JsonOutput
-JsonInput.StringField.JsonOutput
 JsonInput.StringFieldSurrogatePair.JsonOutput
-JsonInput.StringFieldUnicodeEscape.JsonOutput
-JsonInput.StringFieldUnicodeEscapeWithLowercaseHexLetters.JsonOutput
-JsonInput.StringFieldUnicode.JsonOutput
 JsonInput.StringFieldUnpairedLowSurrogate
-JsonInput.StringRepeatedField.JsonOutput
 JsonInput.Struct.JsonOutput
 JsonInput.Struct.ProtobufOutput
 JsonInput.TimestampJsonInputLowercaseT
-JsonInput.TimestampMaxValue.JsonOutput
-JsonInput.TimestampMinValue.JsonOutput
-JsonInput.TimestampRepeatedValue.JsonOutput
-JsonInput.TimestampWithNegativeOffset.JsonOutput
-JsonInput.TimestampWithPositiveOffset.JsonOutput
 JsonInput.Uint32FieldMaxFloatValue.JsonOutput
 JsonInput.Uint32FieldMaxFloatValue.ProtobufOutput
-JsonInput.Uint32FieldMaxValue.JsonOutput
-JsonInput.Uint32MapField.JsonOutput
-JsonInput.Uint64FieldMaxValue.JsonOutput
-JsonInput.Uint64FieldMaxValueNotQuoted.JsonOutput
-JsonInput.Uint64MapField.JsonOutput
 JsonInput.ValueAcceptBool.JsonOutput
 JsonInput.ValueAcceptBool.ProtobufOutput
 JsonInput.ValueAcceptFloat.JsonOutput
@@ -173,11 +90,6 @@ JsonInput.ValueAcceptObject.JsonOutput
 JsonInput.ValueAcceptObject.ProtobufOutput
 JsonInput.ValueAcceptString.JsonOutput
 JsonInput.ValueAcceptString.ProtobufOutput
-JsonInput.WrapperTypesWithNullValue.JsonOutput
-ProtobufInput.DoubleFieldNormalizeQuietNan.JsonOutput
-ProtobufInput.DoubleFieldNormalizeSignalingNan.JsonOutput
-ProtobufInput.FloatFieldNormalizeQuietNan.JsonOutput
-ProtobufInput.FloatFieldNormalizeSignalingNan.JsonOutput
 ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE
 ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
 ProtobufInput.PrematureEofInPackedField.BOOL
diff --git a/python/google/protobuf/pyext/map_container.cc b/python/google/protobuf/pyext/map_container.cc
index 516662ee00..df9138a4d8 100644
--- a/python/google/protobuf/pyext/map_container.cc
+++ b/python/google/protobuf/pyext/map_container.cc
@@ -797,7 +797,7 @@ static PyMethodDef MessageMapMethods[] = {
 
   PyType_Spec MessageMapContainer_Type_spec = {
       FULL_MODULE_NAME ".MessageMapContainer",
-      sizeof(MapContainer),
+      sizeof(MessageMapContainer),
       0,
       Py_TPFLAGS_DEFAULT,
       MessageMapContainer_Type_slots