Skip to content

gh-73055: Skip one additional frame when type.__new__ is called not directly from type.__call__. #14166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
serhiy-storchaka wants to merge 8 commits into from
Closed

gh-73055: Skip one additional frame when type.__new__ is called not directly from type.__call__. #14166

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b14bb1
bpo-28869: Change some details in type().
serhiy-storchaka Jun 17, 2019
0aef546
Merge branch 'master' into type-call-set-module
serhiy-storchaka Jul 21, 2019
c80cd51
Merge branch 'master' into type-call-set-module
serhiy-storchaka Oct 5, 2019
fe3b8c6
Skip additional frame if type.__new__ is not called from type.__call__.
serhiy-storchaka Oct 13, 2019
8b76f9f
Rever moving handling of one-argument call of type().
serhiy-storchaka Oct 13, 2019
c8a471d
Add a NEWS entry.
serhiy-storchaka Oct 13, 2019
32f0bfa
Merge branch 'master' into type-call-set-module
serhiy-storchaka Mar 8, 2020
a0ad2ef
Merge branch 'master' into type-call-set-module
serhiy-storchaka Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-28869: Change some details in type(). 
* Move handling of one-argument call of type() from type.__new__() to type.__call__().
* Move deducing __module__ from the caller's frame from type.__new__() to type.__call__().
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Jun 17, 2019
commit 6b14bb186ccfcf27bfcae0564c09056d5ef1f2d5
92 changes: 51 additions & 41 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ clear_slotdefs(void);
static PyObject *
lookup_maybe_method(PyObject *self, _Py_Identifier *attrid, int *unbound);

static PyObject *
type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds);

static PyObject *
type_new_ex(PyTypeObject *metatype, PyObject *args, PyObject *kwds, int setmodule);

/*
* finds the beginning of the docstring's introspection signature.
* if present, returns a pointer pointing to the first '('.
Expand Down Expand Up @@ -952,33 +958,54 @@ type_call(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *obj;

if (type->tp_new == NULL) {
PyErr_Format(PyExc_TypeError,
"cannot create '%.100s' instances",
type->tp_name);
return NULL;
}

#ifdef Py_DEBUG
/* type_call() must not be called with an exception set,
because it can clear it (directly or indirectly) and so the
caller loses its exception */
assert(!PyErr_Occurred());
#endif

obj = type->tp_new(type, args, kwds);
/* Special case: type(x) should return x->ob_type */
/* We only want type itself to accept the one-argument form (#27157). */
if (type == &PyType_Type) {
assert(args != NULL && PyTuple_Check(args));
assert(kwds == NULL || PyDict_Check(kwds));
Py_ssize_t nargs = PyTuple_GET_SIZE(args);

if (nargs == 1 && (kwds == NULL || PyDict_GET_SIZE(kwds))) {
obj = (PyObject *) Py_TYPE(PyTuple_GET_ITEM(args, 0));
Py_INCREF(obj);
return obj;
}

/* SF bug 475327 -- if that didn't trigger, we need 3
arguments. But PyArg_ParseTuple in type_new() may give
a msg saying type() needs exactly 3. */
if (nargs != 3) {
PyErr_SetString(PyExc_TypeError,
"type() takes 1 or 3 arguments");
return NULL;
}
assert (type->tp_new == type_new);
}

if (type->tp_new == NULL) {
PyErr_Format(PyExc_TypeError,
"cannot create '%.100s' instances",
type->tp_name);
return NULL;
}

if (type->tp_new == type_new) {
obj = type_new_ex(type, args, kwds, 1);
}
else {
obj = type->tp_new(type, args, kwds);
}
obj = _Py_CheckFunctionResult((PyObject*)type, obj, NULL);
if (obj == NULL)
return NULL;

/* Ugly exception: when the call was type(something),
don't call tp_init on the result. */
if (type == &PyType_Type &&
PyTuple_Check(args) && PyTuple_GET_SIZE(args) == 1 &&
(kwds == NULL ||
(PyDict_Check(kwds) && PyDict_GET_SIZE(kwds) == 0)))
return obj;

/* If the returned object is not an instance of type,
it won't be initialized. */
if (!PyType_IsSubtype(Py_TYPE(obj), type))
Expand Down Expand Up @@ -2320,7 +2347,7 @@ _PyType_CalculateMetaclass(PyTypeObject *metatype, PyObject *bases)
}

static PyObject *
type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
type_new_ex(PyTypeObject *metatype, PyObject *args, PyObject *kwds, int setmodule)
{
PyObject *name, *bases = NULL, *orig_dict, *dict = NULL;
PyObject *qualname, *slots = NULL, *tmp, *newslots, *cell;
Expand All @@ -2336,29 +2363,6 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
assert(args != NULL && PyTuple_Check(args));
assert(kwds == NULL || PyDict_Check(kwds));

/* Special case: type(x) should return x->ob_type */
/* We only want type itself to accept the one-argument form (#27157)
Note: We don't call PyType_CheckExact as that also allows subclasses */
if (metatype == &PyType_Type) {
const Py_ssize_t nargs = PyTuple_GET_SIZE(args);
const Py_ssize_t nkwds = kwds == NULL ? 0 : PyDict_GET_SIZE(kwds);

if (nargs == 1 && nkwds == 0) {
PyObject *x = PyTuple_GET_ITEM(args, 0);
Py_INCREF(Py_TYPE(x));
return (PyObject *) Py_TYPE(x);
}

/* SF bug 475327 -- if that didn't trigger, we need 3
arguments. but PyArg_ParseTuple below may give
a msg saying type() needs exactly 3. */
if (nargs != 3) {
PyErr_SetString(PyExc_TypeError,
"type() takes 1 or 3 arguments");
return NULL;
}
}

/* Check arguments: (name, bases, dict) */
if (!PyArg_ParseTuple(args, "UO!O!:type.__new__", &name, &PyTuple_Type,
&bases, &PyDict_Type, &orig_dict))
Expand Down Expand Up @@ -2606,7 +2610,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
type->tp_dict = dict;

/* Set __module__ in the dict */
if (_PyDict_GetItemIdWithError(dict, &PyId___module__) == NULL) {
if (setmodule && _PyDict_GetItemIdWithError(dict, &PyId___module__) == NULL) {
if (PyErr_Occurred()) {
goto error;
}
Expand Down Expand Up @@ -2843,6 +2847,12 @@ static const short slotoffsets[] = {
#include "typeslots.inc"
};

static PyObject *
type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
{
return type_new_ex(metatype, args, kwds, 0);
}

PyObject *
PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
{
Expand Down