From d879311cac9aa81f02644bf445313c2b022c1c9c Mon Sep 17 00:00:00 2001
From: Jie Luo <jieluo@google.com>
Date: Thu, 13 Jun 2024 15:21:50 -0700
Subject: [PATCH] Add type name info for upb python parse error message in
 MergeFromStrig(). To  keep same with cpp extension.

PiperOrigin-RevId: 643138099
---
 python/message.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/python/message.c b/python/message.c
index 8e418f0d7e..719f8581d8 100644
--- a/python/message.c
+++ b/python/message.c
@@ -1350,7 +1350,9 @@ PyObject* PyUpb_Message_MergeFromString(PyObject* _self, PyObject* arg) {
       upb_Decode(buf, size, self->ptr.msg, layout, extreg, options, arena);
   Py_XDECREF(bytes);
   if (status != kUpb_DecodeStatus_Ok) {
-    PyErr_Format(state->decode_error_class, "Error parsing message");
+    PyErr_Format(state->decode_error_class,
+                 "Error parsing message with type '%s'",
+                 upb_MessageDef_FullName(msgdef));
     return NULL;
   }
   PyUpb_Message_SyncSubobjs(self);