mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #28385: An error message when non-empty format spec is passed to

Browse source 
object.__format__ now contains the name of actual type.
This commit is contained in:
Serhiy Storchaka 2016-10-30 19:33:54 +02:00
parent c9b750d249
commit d1af5effc2
3 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Objects/typeobject.c
View file

@ -4318,13 +4318,6 @@ PyDoc_STRVAR(object_subclasshook_doc,
"NotImplemented, the normal algorithm is used. Otherwise, it\n"
"overrides the normal algorithm (and the outcome is cached).\n");
/*
from PEP 3101, this code implements:
class object:
def __format__(self, format_spec):
return format(str(self), format_spec)
*/
static PyObject *
object_format(PyObject *self, PyObject *args)
{
@ -4335,22 +4328,19 @@ object_format(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "U:__format__", &format_spec))
return NULL;
/* Issue 7994: If we're converting to a string, we
should reject format specifications */
if (PyUnicode_GET_LENGTH(format_spec) > 0) {
PyErr_Format(PyExc_TypeError,
"unsupported format string passed to %.200s.__format__",
self->ob_type->tp_name);
return NULL;
}
self_as_str = PyObject_Str(self);
if (self_as_str != NULL) {
/* Issue 7994: If we're converting to a string, we
should reject format specifications */
if (PyUnicode_GET_LENGTH(format_spec) > 0) {
PyErr_SetString(PyExc_TypeError,
"non-empty format string passed to object.__format__");
goto done;
}
result = PyObject_Format(self_as_str, format_spec);
Py_DECREF(self_as_str);
}
done:
Py_XDECREF(self_as_str);
return result;
}