@@ -884,7 +884,10 @@ _Lookup_OnMissing(Lookup *lookup, PyObject *val, PathNode *path) {
884884 }
885885 PyObject *suffix = PathNode_ErrSuffix(path);
886886 if (suffix != NULL) {
887- PyErr_Format(mod->ValidationError, "Invalid enum value %R%U", val, suffix);
887+ const char *format = (lookup->cls != NULL)
888+ ? "Invalid enum value %R%U"
889+ : "Invalid value %R%U";
890+ PyErr_Format(mod->ValidationError, format, val, suffix);
888891 Py_DECREF(suffix);
889892 }
890893
@@ -15390,7 +15393,7 @@ mpack_decode_bool(DecoderState *self, PyObject *val, TypeNode *type, PathNode *p
1539015393 return Py_False;
1539115394 }
1539215395 if (type->types & (MS_TYPE_BOOLLITERAL_TRUE | MS_TYPE_BOOLLITERAL_FALSE)) {
15393- ms_raise_validation_error(path, "Invalid enum value %R%U", val);
15396+ ms_raise_validation_error(path, "Invalid value %R%U", val);
1539415397 return NULL;
1539515398 }
1539615399 return ms_validation_error("bool", type, path);
@@ -17023,7 +17026,7 @@ json_decode_true(JSONDecoderState *self, TypeNode *type, PathNode *path) {
1702317026 return Py_True;
1702417027 }
1702517028 if (type->types & MS_TYPE_BOOLLITERAL_FALSE) {
17026- ms_raise_validation_error(path, "Invalid enum value %R%U", Py_True);
17029+ ms_raise_validation_error(path, "Invalid value %R%U", Py_True);
1702717030 return NULL;
1702817031 }
1702917032 return ms_validation_error("bool", type, path);
@@ -17048,7 +17051,7 @@ json_decode_false(JSONDecoderState *self, TypeNode *type, PathNode *path) {
1704817051 return Py_False;
1704917052 }
1705017053 if (type->types & MS_TYPE_BOOLLITERAL_TRUE) {
17051- ms_raise_validation_error(path, "Invalid enum value %R%U", Py_False);
17054+ ms_raise_validation_error(path, "Invalid value %R%U", Py_False);
1705217055 return NULL;
1705317056 }
1705417057 return ms_validation_error("bool", type, path);
@@ -20708,7 +20711,7 @@ convert_bool(
2070820711 return Py_False;
2070920712 }
2071020713 if (type->types & (MS_TYPE_BOOLLITERAL_TRUE | MS_TYPE_BOOLLITERAL_FALSE)) {
20711- ms_raise_validation_error(path, "Invalid enum value %R%U", obj);
20714+ ms_raise_validation_error(path, "Invalid value %R%U", obj);
2071220715 return NULL;
2071320716 }
2071420717 return ms_validation_error("bool", type, path);
0 commit comments