Skip to content

Commit

Permalink
upb python CopyFrom() back to Serialize/Pasre wrap
Browse files Browse the repository at this point in the history
To unblock protocolbuffers/protobuf#13485

The main will keep the current memory copy and continue try to repro. We will go forward with memory copy in 25.0

THIS MEANS: The bug will return in 25.0 if we don't find an adequate repro in time.
  • Loading branch information
anandolee authored Aug 15, 2023
1 parent c6fc454 commit 78e9694
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions python/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 78e9694

Please sign in to comment.