Merge pull request #1486 from protocolbuffers/anandolee-patch-1

UPB python CopyFrom() back to Serialize/Parse wrap in 24.x
protocolbuffers · Aug 16, 2023 · c54e624 · c54e624
2 parents c6fc454 + 78e9694
commit c54e624
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/python/message.c b/python/message.c
@@ -1655,8 +1655,11 @@ static PyMethodDef PyUpb_Message_Methods[] = {
     {"ClearExtension", PyUpb_Message_ClearExtension, METH_O,
      "Clears a message field."},
     {"ClearField", PyUpb_Message_ClearField, METH_O, "Clears a message field."},
+#ifndef PROTO2_OPENSOURCE
+    // TODO(b/296078718): add the CopyFrom back in 25.0 fro OSS
     {"CopyFrom", PyUpb_Message_CopyFrom, METH_O,
      "Copies a protocol message into the current message."},
+#endif  // !PROTO2_OPENSOURCE
     {"DiscardUnknownFields", (PyCFunction)PyUpb_Message_DiscardUnknownFields,
      METH_NOARGS, "Discards the unknown fields."},
     {"FindInitializationErrors", PyUpb_Message_FindInitializationErrors,