Reword error messages more

Author: encukou

Lib/shelve.py

@@ -114,8 +114,8 @@ def _validate_serialized_value(serialized_value, original_value):
                 invalid_type = "None"
             else:
                 invalid_type = type(serialized_value).__name__
-            msg = (f"Serializer returned {invalid_type} for value "
-                   f"{original_value!r} But database values must be "
+            msg = (f"Serializer returned {serialized_value!r} for value "
+                   f"{original_value!r}, but database values must be "
                    f"bytes or str, not {invalid_type}")
             raise ShelveError(msg)
 

Lib/test/test_shelve.py

@@ -468,16 +468,16 @@ def deserializer(data):
                              deserializer=deserializer) as s:
                 with self.assertRaises(shelve.ShelveError) as cm:
                     s["key"] = "value"
-                self.assertEqual("Serializer returned None for value 'value' "
-                                 "But database values must be bytes or str, not None",
+                self.assertEqual("Serializer returned None for value 'value', but "
+                                 "database values must be bytes or str, not None",
                                  f"{cm.exception}")
 
             with shelve.open(self.fname, serializer=int_serializer,
                              deserializer=deserializer,) as s:
                 with self.assertRaises(shelve.ShelveError) as cm:
                     s["key"] = "value"
-                self.assertEqual("Serializer returned int for value 'value' "
-                                 "But database values must be bytes or str, not int",
+                self.assertEqual("Serializer returned 3 for value 'value', but "
+                                 "database values must be bytes or str, not int",
                                  f"{cm.exception}")
 
     def test_shelve_type_compatibility(self):

Modules/_dbmmodule.c

@@ -232,8 +232,8 @@ dbm_ass_sub_lock_held(PyObject *self, PyObject *v, PyObject *w)
 
     if ( !PyArg_Parse(v, "s#", &krec.dptr, &tmp_size) ) {
         PyErr_Format(PyExc_TypeError,
-                     "dbm key returned %.100s for value %R But database keys must be bytes or str, not %.100s",
-                     Py_TYPE(v)->tp_name, v, Py_TYPE(v)->tp_name);
+                     "database keys must be bytes or str, not %T",
+                     v);
         return -1;
     }
     _dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
@@ -260,8 +260,8 @@ dbm_ass_sub_lock_held(PyObject *self, PyObject *v, PyObject *w)
     } else {
         if ( !PyArg_Parse(w, "s#", &drec.dptr, &tmp_size) ) {
             PyErr_Format(PyExc_TypeError,
-                         "dbm value returned %.100s for value %R But database values must be bytes or str, not %.100s",
-                         Py_TYPE(w)->tp_name, w, Py_TYPE(w)->tp_name);
+                         "database values must be bytes or str, not %T",
+                         w);
             return -1;
         }
         drec.dsize = tmp_size;

Modules/_gdbmmodule.c

@@ -242,7 +242,7 @@ parse_datum(PyObject *o, datum *d, const char *failmsg)
     Py_ssize_t size;
     if (!PyArg_Parse(o, "s#", &d->dptr, &size)) {
         if (failmsg != NULL) {
-            PyErr_Format(PyExc_TypeError, failmsg, Py_TYPE(o)->tp_name, o, Py_TYPE(o)->tp_name);
+            PyErr_Format(PyExc_TypeError, failmsg, o);
         }
         return 0;
     }
@@ -318,8 +318,8 @@ static int
 gdbm_ass_sub_lock_held(PyObject *op, PyObject *v, PyObject *w)
 {
     datum krec, drec;
-    const char *key_failmsg = "dbm key returned %.100s for value %R But database keys must be bytes or str, not %.100s";
-    const char *value_failmsg = "dbm value returned %.100s for value %R But database keys must be bytes or str, not %.100s";
+    const char *key_failmsg = "database keys must be bytes or str, not %T";
+    const char *value_failmsg = "database values must be bytes or str, not %T";
     gdbmobject *dp = _gdbmobject_CAST(op);
     _gdbm_state *state = PyType_GetModuleState(Py_TYPE(dp));